Merge "Add dirty-images-objects handling to boot image build." into oc-mr1-dev