Fix for Bug NMS-6632

Can't download generated reports, a NPE is thrown by the WebUI.

The fix for NMS-6580 must be executed if and only if the fileName
parameter exist and is not null, otherwise, the controller must proceed
to analyze the locatorId to find the physical location of the report.
Fix for Bug NMS-6632

Can't download generated reports, a NPE is thrown by the WebUI.

The fix for NMS-6580 must be executed if and only if the fileName
parameter exist and is not null, otherwise, the controller must proceed
to analyze the locatorId to find the physical location of the report.
Fix for Bug NMS-6632

Can't download generated reports, a NPE is thrown by the WebUI.

The fix for NMS-6580 must be executed if and only if the fileName
parameter exist and is not null, otherwise, the controller must proceed
to analyze the locatorId to find the physical location of the report.
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
[bamboo] Automated branch merge (from 1.10:8d3bc27a18692f75639827c76e940ac098e6b5f1)
fix for SPC-944 add multimap
fix for SPC-949
PJSM-212 Fix embedded XML in poller config (PSM)

When the Poller configuration was converted to JAXB, the config object
now contains the actual objects embedded inside parameters, instead of
an XML string that had to be hand-parsed.  However, the code inside
PollableServiceConfig was calling .toString() on the embedded config.
So, for example, an embedded page sequence would actually be returned
to the PSM as the string representation "PageSequence [Page=foo]" and
it would fail to monitor.  This likely affected other embedded XML like
the MTM as well.

Squashed commit of the following:

commit b7e90c1ee2bd9c786eff45d8d0694336d80d0458
Author: Benjamin Reed <ranger@opennms.org>
Date:   Mon Jul 14 20:35:20 2014 -0400

    better mocking; move to a separate test

commit ca1679f59b5af63fa8d39d877ddb4e599a483542
Author: Benjamin Reed <ranger@opennms.org>
Date:   Mon Jul 14 16:52:30 2014 -0400

    get rid of extraneous field in the test

commit 6da4ce1fe063729ed836268cd057e4ca750f376a
Author: Benjamin Reed <ranger@opennms.org>
Date:   Mon Jul 14 16:34:35 2014 -0400

    PJSM-212 fix handling of objects passed as service parameters

commit 8f9ba982b0874cf712ab0bc0bd16565165eda401
Author: Benjamin Reed <ranger@opennms.org>
Date:   Mon Jul 14 16:15:15 2014 -0400

    remove old useMoxy code, we use it by default now
merge fix
SPC-950 fix typo in isis table
Fixes related to unexpected self-reverting behavior when users modify
the asset records and node category memberships of requisitioned nodes.

For the "Edit Category Memberships" flow for a single node, added a
warning blurb plus a checkbox that the user must tick before being allowed
to submit the form.

For bulk edits of category memberships from the top-level Admin menu, put
requisitioned nodes in separate option-groups inside the select boxes,
initially in a disabled state, and added a checkbox which when ticked will
enable those elements.

For single-node asset editing flow, which is GWT and harder to modify, did
a good-enough speed bump in the form of a Javascript confirm dialog which
is shown only when the node is requisitioned AND the user is not in the
read-only role.

Squashed commit of the following:

commit 9e518d735825805cebbf8e68161f8aff3b0c7153
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Mon Jul 14 10:18:56 2014 -0400

    Do not show asset-editing speed bump for users in the read-only role.

commit d0ba517f75a418db435ff0c258ec9d240ad5eae1
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri Jul 11 10:56:53 2014 -0400

    Speed bump for asset changes on requisitioned nodes

commit 87d785a6e4535df0e39e0fa13e7f955c8633f7b3
Merge: 339842c 8c0dc3a
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri Jul 11 09:59:15 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into features/category-asset-requisition-unfubar

commit 339842ce45f379eca82736176b705f91fd2831b9
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Jul 2 16:41:22 2014 -0400

    Speed bump for mass category changes on requisitioned nodes

commit aea95082e48ef00ad3164129301bbe7ea78677e0
Merge: 2e55e06 ae606f9
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Jul 2 11:08:14 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into features/category-asset-requisition-unfubar

commit 2e55e067e5f77a9d583b098983725f9716243b40
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Thu Jun 26 17:33:14 2014 -0400

    Speed bump for category editing, road closed for node label changes on requisitioned nodes
Merge remote-tracking branch 'origin/space/14.1'

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/config/PollerConfigWithPSMTest.java
Fixes related to unexpected self-reverting behavior when users modify
the asset records and node category memberships of requisitioned nodes.
Addresses NMS-6373 and NMS-6372.

For the "Edit Category Memberships" flow for a single node, added a
warning blurb plus a checkbox that the user must tick before being allowed
to submit the form.

For bulk edits of category memberships from the top-level Admin menu, put
requisitioned nodes in separate option-groups inside the select boxes,
initially in a disabled state, and added a checkbox which when ticked will
enable those elements.

For single-node asset editing flow, which is GWT and harder to modify, did
a good-enough speed bump in the form of a Javascript confirm dialog which
is shown only when the node is requisitioned AND the user is not in the
read-only role.

Squashed commit of the following:

commit 9e518d735825805cebbf8e68161f8aff3b0c7153
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Mon Jul 14 10:18:56 2014 -0400

    Do not show asset-editing speed bump for users in the read-only role.

commit d0ba517f75a418db435ff0c258ec9d240ad5eae1
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri Jul 11 10:56:53 2014 -0400

    Speed bump for asset changes on requisitioned nodes

commit 87d785a6e4535df0e39e0fa13e7f955c8633f7b3
Merge: 339842c 8c0dc3a
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri Jul 11 09:59:15 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into features/category-asset-requisition-unfubar

commit 339842ce45f379eca82736176b705f91fd2831b9
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Jul 2 16:41:22 2014 -0400

    Speed bump for mass category changes on requisitioned nodes

commit aea95082e48ef00ad3164129301bbe7ea78677e0
Merge: 2e55e06 ae606f9
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Jul 2 11:08:14 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into features/category-asset-requisition-unfubar

commit 2e55e067e5f77a9d583b098983725f9716243b40
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Thu Jun 26 17:33:14 2014 -0400

    Speed bump for category editing, road closed for node label changes on requisitioned nodes
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-webapp/src/main/java/org/opennms/web/controller/DownloadReportController.java
Added the Ospf link to jsp page
NMS-6137 add systemd launch file
Ported lint cleanup from mrlambeth-master into master.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	tools/packages/opennms/opennms.spec
create map of outages in Outages for performance