plugins/dns/nsupdate: Fix example of key algorithm

Fix the commented-out example setting for BIND_KEYALGORITHM in the
dns-nsupdate example configuration file.
rubygem-openshift-origin-common: Req. parseconfig

rubygem-openshift-origin-common.spec: Add a Requires: on the parseconfig
rubygem because oo-diagnostics uses parseconfig.

This commit fixes bug 1083334.
rhcsh: Fix quota check if quotas disabled

When testing whether the gear's quota usage is close to its quota limit,
substitute 0 for the empty string in case there was an error reading the
current usage.

This changes fixes a problem that shows up, for example,  if quotas are
disabled:

    > quota
    Disk quotas for user [uuid] (uid [uid]): none

Previously, in this situation, the following error message would appear
when the application developer tried to log into the gear using ssh:

    awk: END { exit ( !(  > 90.0)); }
    awk:                  ^ syntax error
    awk: END { exit ( !(  > 90.0)); }
    awk:                         ^ syntax error
    awk: END { exit ( !(  > 90.0)); }
    awk:                          ^ syntax error
    awk: END { exit ( !(  > 90.0)); }
    awk:                  ^ syntax error
    awk: END { exit ( !(  > 90.0)); }
    awk:                         ^ syntax error
    awk: END { exit ( !(  > 90.0)); }
    awk:                          ^ syntax error

This commit fixes bug 1092722.
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