Merge "Move to using a profile for boot image" into oc-mr1-dev