change the szl label to textfield
Refactored dashlets and added alarm table to alarm dashlet
Merge branch 'master' of github.com:OpenNMS/opennms
Fixed a NullPointerException in alarm dashlet
[bamboo] Automated branch merge (from space/13.2:95262b508fd1f6cd2339430e25e11fa07e59e2b7)
guard against empty input
guard against empty input
limit the number of retries
limit the number of retries
[bamboo] Automated branch merge (from pjsm/2.0:7c32c3a7bb5c709634912e56f692120941ee80b3)
[bamboo] Automated branch merge (from 1.12:239162eea4964793507cad55ac6cbbdcdb35a1d6)
Merge branch 'master' into feature-opennms-tsdb