Merge remote-tracking branch 'upstream/R1.06' into R1.06

Conflicts:
	neutron_plugin_contrail/plugins/opencontrail/ctdb/config_db.py