AMBARI-4667.  Fix for check_tcp not using wrapper for 2.x stack (ncole)
AMBARI-4643. Restart All fails for Client only components. Fix for transition. (swagle)