Moved bag location to /et/cloudstack
Updated test script to also process command line
Added connmark stuff to merge