alarms detail and edit catch monclient exception, pep8 changes
Merge branch 'cindydev' alarm edit and detail catch monclient exception, pep8