Marcus Efraimsson authored Apr 04, 2019 and Torkel Ödegaard committed Apr 05, 2019

Fixes so it's possible to create new notification channel and providing uid.
Fixes better error/result handling when updating a notifcation channel.

Fixes #16372
Ref #16219 #16012

(cherry picked from commit 5da1faf4)