Fixes #3279: Seventh implementation of the Apache reverse proxy, cosmetic and small bug fixes