Merged revisions 3028-3045 from stable branch.

tbrehm

2012-04-12 02bf997271f4d09e91c8fcb9cecd08f06f2400c4

1
ALTER TABLE `web_domain` ADD `document_root_www` VARCHAR( 255 ) NULL AFTER `document_root`;