Added logout action to avoid account usage collision
Merge remote-tracking branch 'origin/2.3-develop' into HEAD
Updated behat tests to match recent code changes