diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
index 7cbd323be92..d37b7af5298 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
@@ -84,11 +84,11 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
 	private static final Map<FhirVersionEnum, FhirContext> ourRetrievalContexts = new HashMap<FhirVersionEnum, FhirContext>();
 	private static final String PROCESSING_SUB_REQUEST = "BaseHapiFhirDao.processingSubRequest";
 	/**
-	 * These are parameters which are supported by {@link BaseHapiFhirResourceDao#searchForIds(Map)}
+	 * These are parameters which are supported by {@link BaseHapiFhirResourceDao#searchForIds(SearchParameterMap)}
 	 */
 	static final Map<String, Class<? extends IQueryParameterAnd<?>>> RESOURCE_META_AND_PARAMS;
 	/**
-	 * These are parameters which are supported by {@link BaseHapiFhirResourceDao#searchForIds(Map)}
+	 * These are parameters which are supported by {@link BaseHapiFhirResourceDao#searchForIds(SearchParameterMap)}
 	 */
 	static final Map<String, Class<? extends IQueryParameterType>> RESOURCE_META_PARAMS;
 	public static final String UCUM_NS = "http://unitsofmeasure.org";
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/pom.xml
deleted file mode 100644
index c4ece128109..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/pom.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<!-- <parent> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir</artifactId> <version>1.6-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> -->
-	
-	<groupId>ca.uhn.hapi.fhir</groupId>
-	<artifactId>hapi-fhir-jpaserver-uhnfhirtest-auth</artifactId>
-	<version>1.0</version>
-	
-	<packaging>war</packaging>
-
-	<name>HAPI FHIR - fhirtest.uhn.ca Auth Server</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.mitre</groupId>
-			<artifactId>openid-connect-common</artifactId>
-			<version>1.2.6</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mitre</groupId>
-			<artifactId>openid-connect-server-webapp</artifactId>
-			<type>war</type>
-			<version>1.2.6</version>
-		</dependency>
-	</dependencies>
-
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>jetty-maven-plugin</artifactId>
-					<configuration>
-						<webApp>
-							<contextPath>/</contextPath>
-							<allowDuplicateFragmentNames>true</allowDuplicateFragmentNames>
-							<jettyEnvXml>src/main/webapp/WEB-INF/jetty-configure.xml</jettyEnvXml>
-						</webApp>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
-					</configuration>
-				</plugin>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId></groupId>
-										<artifactId></artifactId>
-										<versionRange>[0.4,)</versionRange>
-										<goals>
-											<goal></goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<Build-Time>${maven.build.timestamp}</Build-Time>
-						</manifestEntries>
-					</archive>
-					<overlays>
-						<overlay>
-							<groupId>org.mitre</groupId>
-							<artifactId>openid-connect-server-webapp</artifactId>
-							<!-- <excludes> <exclude>WEB-INF/classes/keystore.jwks</exclude> </excludes> -->
-						</overlay>
-					</overlays>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-		<finalName>hapi-fhir-jpaserver-auth</finalName>
-	</build>
-
-</project>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/crypto-config.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/crypto-config.xml
deleted file mode 100644
index 0301caa2f76..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/crypto-config.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2016 The MITRE Corporation
-      and the MIT Internet Trust Consortium
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-      http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
-
-	<bean id="defaultKeyStore" class="org.mitre.jose.keystore.JWKSetKeyStore">
-		<property name="location" value="classpath:keystore.jwks" />
-	</bean>
-	
-	<bean id="defaultsignerService" class="org.mitre.jwt.signer.service.impl.DefaultJWTSigningAndValidationService">
-		<constructor-arg name="keyStore" ref="defaultKeyStore" />
-		<property name="defaultSignerKeyId" value="rsa1" />
- 		<property name="defaultSigningAlgorithmName" value="RS256" />
-	</bean>
-
-	<bean id="defaultEncryptionService" class="org.mitre.jwt.encryption.service.impl.DefaultJWTEncryptionAndDecryptionService">
-		<constructor-arg name="keyStore" ref="defaultKeyStore" />
-		<property name="defaultAlgorithm" value="RSA1_5" />
-		<property name="defaultDecryptionKeyId" value="rsa1" />
-		<property name="defaultEncryptionKeyId" value="rsa1" />
-	</bean>
-
-</beans>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/data-context.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/data-context.xml
deleted file mode 100644
index 484e71ac487..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/data-context.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2016 The MITRE Corporation
-      and the MIT Internet Trust Consortium
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-      http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-       						http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.1.xsd">
-
-	<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-		<property name="jdbcUrl" value="jdbc:hsqldb:mem:oic;sql.syntax_mys=true" />
-<!-- 		<property name="jdbcUrl" value="jdbc:hsqldb:file:/tmp/oic;sql.syntax_mys=true" /> -->
-		<property name="username" value="oic" />
-		<property name="password" value="oic" />
-	</bean>
-
-	<!-- Use the following to set up the OIC tables in the in-memory DB
-		   If you are using a file based HSQLDB you should not run this every time. -->
-	<jdbc:initialize-database data-source="dataSource">
-		<jdbc:script location="classpath:/db/tables/hsql_database_tables.sql"/>
-		<!-- The following file is for the jdbc-user-service spring security implementation -->
-		<jdbc:script location="classpath:/db/tables/security-schema.sql"/>
-		<!-- The following files are for safely bootstrapping users and clients into the database -->
-		<jdbc:script location="classpath:/db/tables/loading_temp_tables.sql"/>
-		<jdbc:script location="classpath:/db/users.sql"/>
-		<jdbc:script location="classpath:/db/clients.sql"/>
-		<jdbc:script location="classpath:/db/scopes.sql"/>
-	</jdbc:initialize-database>
-
-	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
- 		<property name="databasePlatform" value="org.eclipse.persistence.platform.database.HSQLPlatform" />
-		<property name="showSql" value="true" />
-	</bean>
-
-	<!--  The following is for connecting to a MySQL database that has been initialized with 
-			src/main/resources/db/tables/mysql_database_tables.sql -->
-	<!-- 
-	<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-		<property name="driverClassName" value="com.mysql.jdbc.Driver" />
-		<property name="jdbcUrl" value="jdbc:mysql://localhost/oic" />
-		<property name="username" value="oic" />
-		<property name="password" value="oic" />		
-	</bean>
-
-	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
-		<property name="databasePlatform" value="org.eclipse.persistence.platform.database.MySQLPlatform" />
-		<property name="showSql" value="true" />
-	</bean>
-
-	-->
-
-	<!--  The following is for connecting to a PostgreSQL database that has been initialized with
-			src/main/resources/db/tables/psql_database_tables.sql -->
-	<!--
-	<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-		<property name="driverClassName" value="org.postgresql.Driver" />
-		<property name="jdbcUrl" value="jdbc:postgresql://localhost/oic" />
-		<property name="username" value="oic" />
-		<property name="password" value="oic" />
-	</bean>
-
-	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
-		<property name="databasePlatform" value="org.eclipse.persistence.platform.database.PostgreSQLPlatform" />
-		<property name="showSql" value="true" />
-	</bean>
-	-->
-</beans>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/jetty-configure.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/jetty-configure.xml
deleted file mode 100644
index a7e350f7b86..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/jetty-configure.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
-
-	<Call name="setAttribute">
-		<Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg>
-		<Arg>.*/foo-[^/]*\.jar$</Arg>
-	</Call>
-
-</Configure>
\ No newline at end of file
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/jpa-config.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/jpa-config.xml
deleted file mode 100644
index 5df98b83c4c..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/jpa-config.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2016 The MITRE Corporation
-      and the MIT Internet Trust Consortium
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-      http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
-
-	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-		<property name="entityManagerFactory" ref="entityManagerFactory" />
-		<qualifier value="defaultTransactionManager" />
-	</bean>
-
-	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="packagesToScan" value="org.mitre" />
-		<property name="persistenceProviderClass" value="org.eclipse.persistence.jpa.PersistenceProvider" />
-		<property name="dataSource" ref="dataSource" />
-		<property name="jpaVendorAdapter" ref="jpaAdapter" />
-		<property name="jpaPropertyMap">
-			<map>
-				<entry key="eclipselink.weaving" value="false" />
-				<entry key="eclipselink.logging.level" value="INFO" />
-				<entry key="eclipselink.logging.level.sql" value="INFO" />
-				<entry key="eclipselink.cache.shared.default" value="false" />
-			</map>
-		</property>
-		<property name="persistenceUnitName" value="defaultPersistenceUnit" />
-	</bean>
-
-
-</beans>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/local-config.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/local-config.xml
deleted file mode 100644
index c980446e2b5..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/local-config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2016 The MITRE Corporation
-      and the MIT Internet Trust Consortium
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-      http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
-
-
-<!-- Empty: Override this file in your local project to change configuration options. -->
-
-</beans>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/server-config.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/server-config.xml
deleted file mode 100644
index 2302b19b453..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/server-config.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2016 The MITRE Corporation
-      and the MIT Internet Trust Consortium
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-      http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
-
-	<bean id="configBean" class="org.mitre.openid.connect.config.ConfigurationPropertiesBean">
-	    
-	    <!-- This property sets the root URL of the server, known as the issuer -->
-		<property name="issuer" value="http://localhost:8080/openid-connect-server-webapp/" />
-		
-		<!-- This property is a URL pointing to a logo image 24px high to be used in the top bar -->
- 		<property name="logoImageUrl" value="resources/images/openid_connect_small.png" />
- 		
- 		<!-- This property sets the display name of the server, displayed in the topbar and page title -->
- 		<property name="topbarTitle" value="OpenID Connect Server" />
- 		
-		<!-- This property sets the lifetime of registration access tokens, in seconds. Leave it unset (null) for no rotation. -->
-		<!-- <property name="regTokenLifeTime" value="172800" /> -->
-		
-		<!-- This property forces the issuer value to start with "https", recommended on production servers -->
-		<!-- <property name="forceHttps" value="true" /> -->
-		
-		<!-- This property sets the locale for server text -->
-		<!-- <property name="locale" value="sv" /> -->
-
-		<!-- This property sets the set of namespaces for language translation files. The default is "messages". These are checked in the order presented here. -->
-		<!-- 
-		<property name="languageNamespaces">
-			<list>
-				<value>foo</value>
-				<value>bar</value>
-				<value>messages</value>
-			</list>
-		</property>
-		-->
-
-		<!-- This property indicates if a dynamically registered client supports dual flows, such as client_credentials
-		at the same time with authorization_code or implicit -->
-		<!-- <property name="dualClient" value="true" /> -->
-		
-		<!-- This property turns on HEART compliance mode -->
-		<!-- <property name="heartMode" value="true" /> -->
-
-	</bean>
-	
-</beans>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/spring-servlet.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/spring-servlet.xml
deleted file mode 100644
index b3467051ce4..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/spring-servlet.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2016 The MITRE Corporation
-      and the MIT Internet Trust Consortium
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-      http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
-
-<!-- This file has been left blank -->
-<!-- Feel free to override this by using a maven overlay. -->
-<!-- see: https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/wiki/Maven-Overlay-Project-How-To/ -->
-
-</beans>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/task-config.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/task-config.xml
deleted file mode 100644
index 16fb2eee94d..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/task-config.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2016 The MITRE Corporation
-      and the MIT Internet Trust Consortium
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-      http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:task="http://www.springframework.org/schema/task"
-	xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
-
-	<!-- Configuration for scheduled tasks -->
-	<task:scheduler id="taskScheduler" pool-size="10" /> 
-	<task:executor id="taskExecutor" pool-size="5" /> 
-	<task:annotation-driven scheduler="taskScheduler" executor="taskExecutor" /> 
-	
-	<!-- Schedule the token service and approved site service to clear out expired tokens and sites every 5 minutes -->
-	<task:scheduled-tasks scheduler="taskScheduler">
-	    <task:scheduled ref="defaultOAuth2ProviderTokenService" method="clearExpiredTokens" fixed-delay="300000" initial-delay="600000"/>
-	    <task:scheduled ref="defaultApprovedSiteService" method="clearExpiredSites" fixed-delay="300000" initial-delay="600000"/>
-	    <task:scheduled ref="defaultOAuth2AuthorizationCodeService" method="clearExpiredAuthorizationCodes" fixed-delay="300000" initial-delay="600000"/>
-	</task:scheduled-tasks>
-
-</beans>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/user-context.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/user-context.xml
deleted file mode 100644
index b45ac48aa20..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/user-context.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2016 The MITRE Corporation
-      and the MIT Internet Trust Consortium
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-      http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
-
-	<security:authentication-manager alias="authenticationManager">
-		<security:authentication-provider>
-			<security:jdbc-user-service data-source-ref="dataSource"/>
-		</security:authentication-provider>
-	</security:authentication-manager>
-		
-	<mvc:view-controller path="/login" view-name="login" />
-
-	<security:http disable-url-rewriting="true" use-expressions="true"> 
-		<security:form-login login-page="/login" authentication-failure-url="/login?error=failure" authentication-success-handler-ref="authenticationTimeStamper" />
-		<security:intercept-url pattern="/authorize" access="hasRole('ROLE_USER')" />
-		<security:intercept-url pattern="/**" access="permitAll" />
-		<security:custom-filter ref="authRequestFilter" after="SECURITY_CONTEXT_FILTER" />
-		<security:logout logout-url="/logout" />
-		<security:anonymous />
-		<security:expression-handler ref="oauthWebExpressionHandler" />
-		<security:headers>
-			<security:frame-options policy="DENY" />
-		</security:headers>
-		<security:csrf />
-	</security:http>	
-
-</beans>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index b8e6dae9200..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2016 The MITRE Corporation
-      and the MIT Internet Trust Consortium
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-      http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	metadata-complete="true">
-
-	<absolute-ordering />
-
-	<!-- The definition of the Root Spring Container shared by all Servlets 
-		and Filters -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			/WEB-INF/application-context.xml
-		</param-value>
-	</context-param>
-
-	<!-- Creates the Spring Container shared by all Servlets and Filters -->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<!-- filter through Spring Security -->
-
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-		<init-param>
-			<param-name>contextAttribute</param-name>
-			<param-value>org.springframework.web.servlet.FrameworkServlet.CONTEXT.spring</param-value>
-		</init-param>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<!-- Processes application requests -->
-	<servlet>
-		<servlet-name>spring</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>spring</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
-
-	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<trim-directive-whitespaces>true</trim-directive-whitespaces>
-		</jsp-property-group>
-	</jsp-config>
-	
-	<error-page>
-		<location>/error</location>
-	</error-page>
-	
-</web-app>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/ca.uhn.fhir.jpa.entity.ResourceTable/segments_1 b/hapi-fhir-jpaserver-uhnfhirtest/ca.uhn.fhir.jpa.entity.ResourceTable/segments_1
deleted file mode 100644
index ff1a27c7e7c..00000000000
Binary files a/hapi-fhir-jpaserver-uhnfhirtest/ca.uhn.fhir.jpa.entity.ResourceTable/segments_1 and /dev/null differ
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/ca.uhn.fhir.jpa.entity.ResourceTable/write.lock b/hapi-fhir-jpaserver-uhnfhirtest/ca.uhn.fhir.jpa.entity.ResourceTable/write.lock
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java b/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java
index ed48982109e..c8ff3b023fb 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java
@@ -30,13 +30,13 @@ public class UhnFhirTestApp {
 		System.setProperty("fhir.lucene.location.tdl2", "./target/testlucene_tdl2");
 		System.setProperty("fhir.db.location.tdl3", "./target/testdb_tdl3");
 		System.setProperty("fhir.lucene.location.tdl3", "./target/testlucene_tdl3");
-		System.setProperty("fhir.baseurl.dstu1", base.replace("Dstu2", "Dstu1"));
 		System.setProperty("fhir.baseurl.dstu2", base);
+		System.setProperty("fhir.baseurl.dstu1", base.replace("Dstu2", "Dstu1"));
 		System.setProperty("fhir.baseurl.dstu3", base.replace("Dstu2", "Dstu3"));
 		System.setProperty("fhir.baseurl.tdl2", base.replace("baseDstu2", "testDataLibraryDstu2"));
 		System.setProperty("fhir.baseurl.tdl3", base.replace("baseDstu2", "testDataLibraryStu3"));
 		System.setProperty("fhir.tdlpass", "aa,bb");
-		
+
 		Server server = new Server(myPort);
 
 		WebAppContext root = new WebAppContext();