-Cherry pick with brach of "emin"
-Cherry pick with brach of "emin"


Former-commit-id: e7c3950062e881a13bf35ac5ee4073bed320651c
subutai-io/Subutai,subutai-io/Subutai,subutai-io/Subutai,subutai-io/Subutai,subutai-io/base,subutai-io/base,subutai-io/Subutai,subutai-io/base,subutai-io/Subutai,subutai-io/base