Support vagrant 1.1 and 1.2 for setting hostname
Merge branch 'hostname_version_compatibility'