Changes related to upgrades and apache commons lang.