Refs #4499 This should fix the issue with htaccess files being incorrect.
Todo: create Update file to re-create all htaccess files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/Installation/ServerFilesGenerator.php