testMerge branch 'master' of http://stash.safehaus.org/scm/ksksagent/main
testMerge branch 'master' of http://stash.safehaus.org/scm/ksksagent/main

subutai-io/Subutai,subutai-io/base,subutai-io/base,subutai-io/base,subutai-io/Subutai,subutai-io/base,subutai-io/Subutai,subutai-io/Subutai,subutai-io/Subutai,subutai-io/Subutai