Merge "Add keystone v3 EC2 credential tests and client"