Numerous production deployment related fixes and tweaks

RE: Redmine #8078