Merge "Fix failure in nbinotifications functional tests" into stable/phosphorus