Imported Upstream version 8.0.3-2
Merge tag 'upstream/8.0.3-2'

Upstream version 8.0.3-2
reinstate debian/conf directories...
fix patch for index.php
modify debian files
Remove placeholder from .htaccess