master
7903254: Fix trailing whitespace in files
7901941: Consolidate test layout
7903223: Enable no-display-required parts of Basic tests in HEADLESS mode