Apply xfail to class rather than methods.
Mark additional intermittent search test.
Rename test and helper classes to conform to pytest naming rules.
merge dev_4_4 -D org -I include -E exclude: PR 1690 (Webfigure TEMP)
merge dev_4_4 -D org -I include -E exclude: PR 1805 (Upgrade ICE jars to version 3.5.1 (4.4))
merge dev_4_4 -D org -I include -E exclude: PR 1819 (Update dev_4_4 submodules)
merge dev_4_4 -D org -I include -E exclude: PR 1827 (ldap discover username/password fix, paging and dn check (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1831 (fix #10581: getTile byte-ordering issue (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1834 (#11723 adding FORCE_SCRIPT_NAME to the settings.py (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1839 (Error handling of tile image loading in PanoJS See #11709)
merge dev_4_4 -D org -I include -E exclude: PR 1843 (Disable chgrp event logs)
merge dev_4_4 -D org -I include -E exclude: PR 1848 (11709 tile access)
merge dev_4_4 -D org -I include -E exclude: PR 1850 (dev_4_4: Extract Django when it's missing or is the wrong version)
merge dev_4_4 -D org -I include -E exclude: PR 1855 (Fix SPW delete test timeouts (see #11540). (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1859 (Thumbnails dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1860 (Edit name dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1862 (Script parameter dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1869 (Brightness dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1904 (Fix import exception window layout (see #11797). (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1907 (Mark further search tests as xfail (dev_4_4))