[BZ 837449] Change behaviour of apache plugin to select ServerName + VirtualHost combination as first priority for resourceName and fall back to server address only if ServerName can not be found
(cherry picked from commit 33ce700d3c3d9c657e0d5b98511c178e797e48bb)