Merge "Bug 6278: Switch to use odlparent's karaf-parent" into stable/boron