updating neutron_admin_auth_url with keystone ip address

Change-Id: If32888714c595e5b7ec47400c4c8f84e415a11db
Merge "updating neutron_admin_auth_url with keystone ip address"
Merge remote-tracking branch 'upstream/master'