Re #9330. Path configuration for unstable/nightly on Ubuntu.
Merge branch 'bugfix/9330_tests_on_unstable' into develop