Four-space indent
Use existing wait_procs option instead of separate conditional
Remove rogue line
Fix up tests for new license and settings data import
ghe-maintenance-mode-enable noops when license file doesn't exist

This means the VM is entirely fresh and hasn't been setup yet so
there's no need to wait on processes to finish.
ghe-service-ensure-* commands are >= 2.x only

I'd like to move these directly into the import-XXX commands on the
VM instead of having to maintain all these conditionals.
Don't try to import license file on earlier fs layouts