Merge "remove ODL/karaf from common"