* add WS API support for locks and simplify lock service calls * move return outside of try blocK * fix rebase conflicts
Co-authored-by: Martin Hjelmare <marhje52@gmail.com>