change agent conf section name from LINK-LOCAL to FLOWS
Add simple test script to create a couple of networks and launch VM
update the vnswad config template - FLOWS section
Add localrc variables to change Cassandra memory options
Merge pull request #33 from haripk/master

change agent conf section name from LINK-LOCAL to FLOWS
simple test script - allow some delay for VM to come up before poking
Revert "simple test script - allow some delay for VM to come up before poking"

This reverts commit 573afc2cef05e488f495019071e0cef257dab192.
simple test script - allow some delay for VM to come up before poking
Merge pull request #34 from safchain/cassandra-mem-opt

Add localrc variables to change Cassandra memory options
Workaround for oslo.config not installing for some reason
Allow script to rerun
fix for https://bugs.launchpad.net/opencontrail/+bug/1271735; run control-node as root
Merging from dsetia/devstack
wqMerge remote-tracking branch 'other/master'

Conflicts:
	lib/neutron_thirdparty/contrail