Generate agent configuration in INI format instead of XML format
Merge commit '1d5001f70aa27210a8099b001f33537a1055943d' into devel

Conflicts:
	lib/neutron_thirdparty/contrail