Checkstyle fixes

Also revert the vsphere check; just log/ignore any error