Merge changes from topic 'rm-devstack-ocata-images'