217 not trying to delete root user anymore
Merge branch '217_setup_cluster_user_fix' into vanilla_improvements