Issue #2942769 by neclimdul: Consolidate umami .htaccess files and testing - coding standards followup (cherry picked from commit 097d71c2)