Fix up the auth section for neutron

Change-Id: I06137c7273fad1ea6be7d9d7df2afc7a2012dd11
Merge "Fix up the auth section for neutron" into production