Merge pull request #32 from ashoksr/master

Generate agent configuration in INI format instead of XML format
change agent conf section name from LINK-LOCAL to FLOWS
Add simple test script to create a couple of networks and launch VM
Revert "Generate agent configuration in INI format instead of XML format"

This reverts commit 1d5001f70aa27210a8099b001f33537a1055943d.

Conflicts:
	lib/neutron_thirdparty/contrail
Merge branch 'master' into devel
Resolve conflict with collector backported patch
Resolve some merge conflict
Merge commit 'a8e10409bb15d0ac71a76bd0d267ee2b59acdd53' into devel