Merge "Convert image and identity api tests to use global CONF object"