vhost frontend: fix annotation logging

Bug 1092426 - "-DOpenShiftAnnotateFrontendAccessLog" option does NOT
work with vhost frontend plugin.
https://bugzilla.redhat.com/show_bug.cgi?id=1092426

A dynamic part of the template was moved to a static include. It fails
when the annotation option is set. The fix is to set env vars in the
dynamic template and log them in the include.
Merge pull request #5355 from sosiouxme/bz1092426

Merged by openshift-bot
Merge pull request #5351 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Fix JBoss installation issue (metrics)

Fix JBoss installation issue caused by having the JBoss cartridges
depend on the jboss-openshift-metrics-module package. Installing the
metrics module first causes /etc/alternatives/jboss{as-7,eap-6} to be
created as a real directory, instead of as a symlink, which results in
the cartridge failing to start.
Annual Online SKU Support
added -clearplanexpirationdate
Moved srec deletetion to billing plugin
Merge pull request #5334 from lnader/annual

Merged by openshift-bot
Add plan attributes

Pass usage_rates to cost helper methods

Move cartridges_premium to helper method

Update user schema
Fix call to gear_increase_indicator
Merge pull request #5340 from liggitt/plan_attributes

Merged by openshift-bot
Merge pull request #5358 from ncdc/fix-jboss-metrics

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.17.4-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.24.5-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-vhost] release [0.6.3-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.24.3-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.24.4-1].
Automatic commit of package [openshift-origin-cartridge-dependencies] release [1.24.3-1].
Automatic commit of package [openshift-origin-broker-util] release [1.24.3-1].
Passing a class instead of an instance for the gear placement plugin