Merge "[Octavia] keystone v3 fixes" into release/2018.11.0