Implement NMS-7066: Add and collect JMX attribute for OpenNMS uptime
Fixing the JSON Collector JUnit test to use a valid JSON data.
Merge branch 'rc/stable/1.14.0' of github.com:OpenNMS/opennms into jira/NMS-7066
disable 'Add to Focus' context menu it for nodes in focus
Merge branch 'jira/NMS-7019' into rc/stable/1.14.0
update script to handle groovy
update license on groovy files
log4j 2.1 is out, update to official
First stab at NMS-7088. This will probably break the smoke tests.
Try to head off obvious smoke test breakage for NMS-7088 changes before pushing
Merge branch 'jira/NMS-7066' into rc/stable/1.14.0
Merge branch 'jira/NMS-7088' into rc/stable/1.14.0
[bamboo] Automated branch merge (from rc/stable/1.14.0:6d4e371a5e289b0c05154f98541caa6c92a5fae6)
Merge branch 'develop' into docuMerge