BAP-498: Investigate failed builds
 - fixed selenium tests
BAP-498: Investigate failed builds and tests
 - fixed unit test
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'remotes/origin/master' into release
Merge remote-tracking branch 'remotes/dev/release'