fix for https://bugs.launchpad.net/opencontrail/+bug/1271735; fix path
Fix for https://bugs.launchpad.net/opencontrail/+bug/1311670; fix passing env variable to sudo
Merge from dsetia/devstack
Merge remote-tracking branch 'other/master'

Conflicts:
	lib/neutron_thirdparty/contrail