Merge MozillaBuildSetup from 1.5.1 to 1.7