Merge remote-tracking branch 'origin/enh-domain' into enh-domain

# Conflicts:
#	docker/pom.xml
#	onejar/pom.xml
#	pom.xml
#	server/pom.xml
#	server/src/main/java/password/pwm/PwmApplication.java
#	server/src/main/java/password/pwm/config/AppConfig.java
#	server/src/main/java/password/pwm/config/profile/LdapProfile.java
#	server/src/main/java/password/pwm/health/HealthService.java
#	server/src/main/java/password/pwm/health/LDAPHealthChecker.java
#	server/src/main/java/password/pwm/http/HttpEventManager.java
#	server/src/main/java/password/pwm/http/filter/DomainInitFilter.java
#	server/src/main/java/password/pwm/http/filter/RequestInitializationFilter.java
#	server/src/main/java/password/pwm/http/servlet/AbstractPwmServlet.java
#	server/src/main/java/password/pwm/http/servlet/ForgottenUsernameServlet.java
#	server/src/main/java/password/pwm/http/servlet/activation/ActivateUserServlet.java
#	server/src/main/java/password/pwm/http/servlet/admin/AppDashboardData.java
#	server/src/main/java/password/pwm/http/servlet/changepw/ChangePasswordServlet.java
#	server/src/main/java/password/pwm/http/servlet/configmanager/ConfigManagerLoginServlet.java
#	server/src/main/java/password/pwm/http/servlet/forgottenpw/ForgottenPasswordServlet.java
#	server/src/main/java/password/pwm/http/servlet/forgottenpw/ForgottenPasswordStateMachine.java
#	server/src/main/java/password/pwm/http/servlet/helpdesk/HelpdeskServlet.java
#	server/src/main/java/password/pwm/http/servlet/resource/ResourceFileServlet.java
#	server/src/main/java/password/pwm/ldap/LdapBrowser.java
#	server/src/main/java/password/pwm/ldap/auth/LDAPAuthenticationRequest.java
#	server/src/main/java/password/pwm/ldap/auth/SessionAuthenticator.java
#	server/src/main/java/password/pwm/svc/cr/NMASCrOperator.java
#	server/src/main/java/password/pwm/svc/event/AuditServiceClient.java
#	server/src/main/java/password/pwm/svc/httpclient/ApachePwmHttpClient.java
#	server/src/main/java/password/pwm/svc/httpclient/HttpClientService.java
#	server/src/main/java/password/pwm/svc/httpclient/JavaPwmHttpClient.java
#	server/src/main/java/password/pwm/svc/httpclient/PwmHttpClient.java
#	server/src/main/java/password/pwm/svc/httpclient/PwmHttpClientRequest.java
#	server/src/main/java/password/pwm/svc/httpclient/PwmHttpClientResponse.java
#	server/src/main/java/password/pwm/svc/intruder/IntruderDomainService.java
#	server/src/main/java/password/pwm/svc/intruder/IntruderRecordManagerImpl.java
#	server/src/main/java/password/pwm/svc/intruder/IntruderServiceClient.java
#	server/src/main/java/password/pwm/svc/intruder/IntruderSystemService.java
#	server/src/main/java/password/pwm/svc/intruder/PublicIntruderRecord.java
#	server/src/main/java/password/pwm/svc/node/LDAPNodeDataService.java
#	server/src/main/java/password/pwm/svc/node/NodeService.java
#	server/src/main/java/password/pwm/svc/pwnotify/PwNotifyLdapStorageService.java
#	server/src/main/java/password/pwm/svc/report/ReportRecordLocalDBStorageService.java
#	server/src/main/java/password/pwm/svc/report/ReportService.java
#	server/src/main/java/password/pwm/svc/stats/StatisticsClient.java
#	server/src/main/java/password/pwm/svc/token/TokenService.java
#	server/src/main/java/password/pwm/svc/wordlist/AbstractWordlist.java
#	server/src/main/java/password/pwm/svc/wordlist/WordlistImporter.java
#	server/src/main/java/password/pwm/svc/wordlist/WordlistInspector.java
#	server/src/main/java/password/pwm/svc/wordlist/WordlistService.java
#	server/src/main/java/password/pwm/svc/wordlist/WordlistSource.java
#	server/src/main/java/password/pwm/svc/wordlist/WordlistStatistics.java
#	server/src/main/java/password/pwm/svc/wordlist/WordlistZipReader.java
#	server/src/main/java/password/pwm/util/debug/AboutItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/AppDebugItemInput.java
#	server/src/main/java/password/pwm/util/debug/AppItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/AppPropertiesItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/BuildInformationDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/CacheServiceDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/ClusterInfoDebugGenerator.java
#	server/src/main/java/password/pwm/util/debug/ConfigurationDebugJsonItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/ConfigurationDebugTextItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/ConfigurationFileItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/DashboardDataDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/DomainDebugItemInput.java
#	server/src/main/java/password/pwm/util/debug/DomainItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/FileInfoDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/HealthDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/IntruderDataGenerator.java
#	server/src/main/java/password/pwm/util/debug/LDAPPermissionItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/LdapConnectionsDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/LdapDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/LdapRecentUserDebugGenerator.java
#	server/src/main/java/password/pwm/util/debug/LocalDBDebugGenerator.java
#	server/src/main/java/password/pwm/util/debug/LogDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/LogJsonItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/RootFileSystemDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/ServicesDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/SessionDataGenerator.java
#	server/src/main/java/password/pwm/util/debug/StatisticsDataDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/StatisticsEpsDataDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/SystemEnvironmentItemGenerator.java
#	server/src/main/java/password/pwm/util/debug/ThreadDumpDebugItemGenerator.java
#	server/src/main/java/password/pwm/util/java/ConditionalTaskExecutor.java
#	server/src/main/java/password/pwm/util/java/CopyingInputStream.java
#	server/src/main/java/password/pwm/util/java/MovingAverage.java
#	server/src/main/java/password/pwm/util/java/StatisticAverageBundle.java
#	server/src/main/java/password/pwm/util/java/StringUtil.java
#	server/src/main/java/password/pwm/util/localdb/XodusLocalDB.java
#	server/src/main/java/password/pwm/util/logging/LocalDBLogger.java
#	server/src/main/java/password/pwm/util/password/RandomPasswordGenerator.java
#	server/src/main/java/password/pwm/ws/server/RestAuthenticationProcessor.java
#	server/src/main/java/password/pwm/ws/server/RestServlet.java
#	server/src/main/java/password/pwm/ws/server/RestUtility.java
#	server/src/main/resources/password/pwm/AppProperty.properties
#	server/src/main/resources/password/pwm/i18n/PwmSetting.properties
#	server/src/test/java/password/pwm/config/PwmSettingMetaDataReaderTest.java
#	server/src/test/java/password/pwm/util/java/StringUtilTest.java
#	webapp/src/main/webapp/public/resources/js/configeditor.js

server/src/main/java/password/pwm/config/value/AbstractValue.java

@@ -20,7 +20,6 @@
 
 package password.pwm.config.value;
 
-import password.pwm.PwmConstants;
 import password.pwm.config.stored.StoredConfigXmlConstants;
 import password.pwm.config.stored.XmlOutputProcessData;
 import password.pwm.error.PwmUnrecoverableException;

server/src/main/java/password/pwm/svc/wordlist/SeedlistService.java

@@ -48,4 +48,9 @@ public class SeedlistService extends AbstractWordlist implements Wordlist
     {
         return super.randomSeed();
     }
+
+    @Override
+    protected void warmup()
+    {
+    }
 }