BZ 1115815 - explicitly set the from address for alert emails to what is given in rhq-server.properties.
Adding Michael (Yak) to rhq irc bot so that !jon-team command could ping him
Bug 1116000 - Error creating "Local Disk Storage Content Source"

Database property retriever needs to be registered at startup with PropertyRenderingUtility#putDynamicPropertyRetriever

This setup code snippet was lost during AS7 rebasing for RHQ4.6
Maintain ordinals for existing SystemSetting enum entries by ensuring
new entries are added to the end.  This is much safer for backward
compatibility and cherry-picking for cumulative patches.
[BZ 1027339] Show correct JVM pid in the rhqctl status