PMO-2776: removed custom LogoutController
Merge branch 'master' into 1.9.x