Fix logic errors in validate cluster and make it work for vagrant again
Merge pull request #988 from derekwaynecarr/keep_validate_cluster_provider_neutral

Fix logic errors in validate cluster and make it work for vagrant again