3.0.x juno compatible kepler

Cherry-picked the 2 commits needed to have the Juno build compatible with Kepler, and removed an unnecessary reference to junit.