Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/CdssCoreApplication.java

@@ -11,7 +11,6 @@ import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Configuration;
 
 
 /**
@@ -21,7 +20,6 @@ import org.springframework.context.annotation.Configuration;
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
         JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
-@Configuration
 @EnableFeignClients({ "com.diagbot.client" })
 @EnableHystrix
 @EnableHystrixDashboard