Merge pull request #129 from OpenNMS/jira/NMS-6860-1.12

jira/NMS-6860 for OpenNMS 1.12.
[bamboo] Automated branch merge (from 1.12:b039bce4397a7270a7d7b74281f675517363366f)