[bamboo] Automated branch merge (from 1.12:e436017a025dbcdb262faa2cedc0ac88fb135920)
[bamboo] Automated branch merge (from 1.12:e436017a025dbcdb262faa2cedc0ac88fb135920)

rdkgit/opennms,rdkgit/opennms,rdkgit/opennms,roskens/opennms-pre-github,roskens/opennms-pre-github,roskens/opennms-pre-github,rdkgit/opennms,aihua/opennms,tdefilip/opennms,roskens/opennms-pre-github,aihua/opennms,roskens/opennms-pre-github,rdkgit/opennms,rdkgit/opennms,roskens/opennms-pre-github,rdkgit/opennms,tdefilip/opennms,aihua/opennms,aihua/opennms,tdefilip/opennms,aihua/opennms,roskens/opennms-pre-github,aihua/opennms,tdefilip/opennms,aihua/opennms,tdefilip/opennms,rdkgit/opennms,roskens/opennms-pre-github,tdefilip/opennms,tdefilip/opennms,rdkgit/opennms,tdefilip/opennms,roskens/opennms-pre-github,aihua/opennms,tdefilip/opennms,rdkgit/opennms,aihua/opennms,roskens/opennms-pre-github,roskens/opennms-pre-github