Merge "Add cinder tempest cases for encryption-type"