* Merge javaagent-instrumentation-api into javaagent-extension-api * remove some leftover references to javaagent-instrumentation-api * add missing instrumentation-api to distro example