DEVIDM-51: Some minor reordering of methods.
Merge branch 'DEVIDM-51' of github.com:tomma/sukat-cxf-svc into DEVIDM-51