Merge remote-tracking branch 'runelite/master' into 0908-merge

Conflicts:
	runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AllRequirementsCollection.java

http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java

@@ -161,7 +161,7 @@ public class SpringBootWebApplication extends SpringBootServletInitializer
 		return createSql2oFromDataSource(dataSource);
 	}
 
-	@Bean
+	@Bean(destroyMethod = "")
 	public MongoClient mongoClient(@Value("${mongo.host:}") String host, @Value("${mongo.jndiName:}") String jndiName) throws NamingException
 	{
 		if (!Strings.isNullOrEmpty(jndiName))