query cluster for node safety
minor cleanup
Merge pull request #2803 from ahmetmircik/new/3.3/safe

Query cluster for node/cluster safety