Merge "Bug 537847 - Two versions of commons logging in the update site"