Merge "Fix issues with keystone-dsvm-py35-functional-v3-only on py35"