Updates for RM 424
Merge pull request #1 from zenoss/UpdateFor424

Updates for RM 424