Cleanup backported from rails4 branch

Just to get the changes from https://github.com/SUSE-Cloud/barclamp-hyperv-compute/pull/1 into the correct repository.