Merge "Move jacocoagent into the bootclasspath"