Fixed AlarmIdNotFoundException smoke test failure by fixing the try/catch
statement inside AlarmDetailController so that it throws the exception properly.
This is related to fixes for bug NMS-6125.
Merge branch 'master' into pjsm/2.0