Merge 1421400 from release4.9 to develop. build.xml is also a merged file but it should have been included in rev 1421347.