Merge branch 'master' into realthargor/jboss7_support
fixed fileheader
fixed formating
refactored the jmx-config-gen starter
corrections for jmx webgui
Changed classes to use more appropriate constants from OnmsCriteria.
Got rid of unnecessary casts, warning cleanup.
Merge branch '1.12'
Merge branch '1.12'
Merge branch '1.12'
Add https support for NCS Path provider
don't init additional opts; allow setting in env
fix camel dependencies
Fix #SPC-599
fix ncs test
Merge branch '1.12'
Disable double click zoom, single click conflicts
Merge branch '1.12'
Fix of #SPC-598 and #SPC-600
update ncs feature with correct camel http component