rhq-project/ems — pull request #5 by genman (2014-10-17 18:10:19+00:00)
Title: Bug/1146167

Feel free to squash the changes, but I have the commits divided into steps as necessary.