Reinstate "Fix for Bug NMS-6551"

This reverts commit 55304f4105fe4ce64bcaf193fbf1c8064f3d1cbd.
It puts back the (currently broken) Alarmd patch for NMS-6551.
Add an extra NPE on AlarmPersisterImpl to make AlarmdTest and AlarmsPafeTest happy.
Merge branch 'jira/NMS-6551' into 1.12
Merge remote-tracking branch 'origin/1.12' into release-14.0.2