Merge branch 'VCL-1116_use_database_hostnames_for_ad_joined_computers' into develop