Merge "Make this script work with keystone v2 and v3"