merging from master into 323- branch

2 jobs for 323_unordered_cell_locking in 29 minutes and 19 seconds (queued for 17 seconds)
Name Stage Failure
failed
tests Tests
/usr/bin/xdg-open: 778: /usr/bin/xdg-open: google-chrome: not found
/usr/bin/xdg-open: 778: /usr/bin/xdg-open: www-browser: not found
/usr/bin/xdg-open: 778: /usr/bin/xdg-open: links2: not found
/usr/bin/xdg-open: 778: /usr/bin/xdg-open: elinks: not found
/usr/bin/xdg-open: 778: /usr/bin/xdg-open: links: not found
/usr/bin/xdg-open: 778: /usr/bin/xdg-open: lynx: not found
/usr/bin/xdg-open: 778: /usr/bin/xdg-open: w3m: not found
xdg-open: no method available for opening 'file:/builds/flatland/flatland/htmlcov/index.html'
ERROR: Job failed: command terminated with exit code 1