Merge "[Octavia] keystone v3 fixes"