Changed to only run winrm test command only when bootstrap-protocol is winrm.  Modified to run winrm command just before bootstrapping. Plus some cleanup.