o.c.application.xmlrpc.server: Added conversion of alarm serverity
Merge branch 'rel15x' of github.com:Desy-extern/cs-studio into rel15x