Merge remote-tracking branch 'origin/master'

Author: rodrabe

tests/managers/image_tests.py

@@ -166,7 +166,6 @@ def test_import_image_cos(self):
                    'operatingSystemReferenceCode': 'UBUNTU_LATEST',
                    'uri': 'cos://some_uri',
                    'ibmApiKey': 'some_ibm_key',
-                   'crkCrn': 'some_root_key_crn',
                    'wrappedDek': 'some_dek',
                    'cloudInit': False,
                    'byol': False,