-m SUBUTAI-1347 Merge with master branch
-m SUBUTAI-1347
Merge with master branch

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