resolve conflicts merging spark and main
resolve conflicts merging spark and main

Former-commit-id: 02236930dda179057ba27664f1175fc5e3f9f9f3
subutai-io/Subutai,subutai-io/Subutai,subutai-io/Subutai,subutai-io/Subutai,subutai-io/base,subutai-io/base,subutai-io/base,subutai-io/base,subutai-io/Subutai,subutai-io/Subutai