Merge "Fix failure in nbinotifications functional tests"