Refs #5586: Reindent/comment Rudder apache vhosts
Fixes #5586: Create an Apache 2.4+ compatible virtualhost
Fixes #5593: add property name for windows 2012
Merge pull request #619 from Kegeruneku/bug_5183/dev/5586_provide_apache2_4_compatible_vhosts

Bug 5183/dev/5586 provide apache2 4 compatible vhosts
Merge pull request #620 from ncharles/bug_5593/dev/windows_2012_name

Fixes #5593: add property name for windows 2012
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11'