update for name change to Neutron

Note: Nova and Horizon are not updated until those projects have
migrated.

Change-Id: I256ef20e7caadd9c96e6dd908c5d8b69ca5c4aeb
Merge "update for name change to Neutron"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp