#4961 modified remote API client edit to include lock and cancel, functions... Closes #4961 See merge request !1453