Back out selenium-java and http{core,client} dep changes for the time being
fix source generation for bundles
Merge branch '1.12'