Merge "Enable keystoneauth for octavia_identity"