Revert "Revert "Bug 927642 - Fix dir/lang integration tests for notifica...

...tions""

This reverts commit 5a185523e3b95410eb812fa616355d9812327e2e.