Merge branch 'develop' into stable

		<unimportant.version>[1.0.0,)</unimportant.version>

		<license.skip>true</license.skip>

		<!-- Jackson v2.20+ uses a different version number for jackson-annotations -->

		<!-- Jackson v2.20+ uses a concatenated version number for jackson-annotations -->

		<jackson-annotations.version>2.21</jackson-annotations.version>

	</properties>

			<dependency>

				<groupId>org.codehaus.woodstox</groupId>

				<artifactId>stax2-api</artifactId>

				<version>4.2.2</version>

				<version>${unimportant.version}</version>

				<scope>provided</scope>

			</dependency>

			<dependency>

			<plugin>

				<groupId>com.inteligr8</groupId>

				<artifactId>merge-maven-plugin</artifactId>

				<version>1.0.0</version>

				<version>1.0.1</version>

				<executions>

					<execution>

						<id>merge-bus-extensions</id>

			<plugin>

				<groupId>io.repaint.maven</groupId>

				<artifactId>tiles-maven-plugin</artifactId>

				<version>2.40</version>

				<version>2.41</version>

				<extensions>true</extensions>

				<configuration>

					<tiles>