Resolve conflicts caused by backported items

This resolves conflicts caused by backported item c946139e4e2e81bfdb8f301a35fd1893893bbcb3
(Fixing issue with editing N1K network profiles)

Conflicts:
	openstack_dashboard/dashboards/router/nexus1000v/forms.py
	openstack_dashboard/dashboards/router/nexus1000v/templates/nexus1000v/_update_network_profile.html
	openstack_dashboard/dashboards/router/nexus1000v/tests.py
	openstack_dashboard/dashboards/router/nexus1000v/views.py