add lifecycle mapping for the depends plugin
fix for NPE loading map when no categories exist on a node
NMS-5584 fix handling of IP addresses with zone indeces
Merge branch 'rc/unstable/1.11.90' into 1.12
Merge branch '1.12'
NMS-5584 fix handling of IP addresses with zone indeces
Merge remote-tracking branch 'origin/1.10' into rc/unstable/1.11.90
Merge branch 'rc/unstable/1.11.90' into 1.12
Merge branch '1.12'
Fixing the assets box on the node's page

This box is related with the description field and comments field from
the assets table only.

The link to the geo-map is handled on a different way right now.
Merge branch '1.12' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms into 1.12
Merge branch '1.12'
a little cleanup/reformat of PSM-related things
NMS-5801 PSM parameters should not be immutable, ParameterMap modifies them
Fixing the assets box on the node's page

This box is related with the description field and comments field from
the assets table only.

The link to the geo-map is handled on a different way right now.
Merge branch 'rc/unstable/1.11.90' into 1.12
Merge branch '1.12'