Updates to make the 4.2 git branch to build in batlab and test under bamboo.