Merge branches 'stable-31', 'ixp4xx-31', 'ixp4xx-local-31' and 'router-31' into build-router-31