Merge branches 'stable25', 'gml25', 'ixp4xx25', 'router25', 'hdlc-fixes' and 'hdlc-ppp' into build-router-25