2.3.3

Code cleaning and gradle build fixes

* Remove src/main/java/org/elasticsearch/discovery/srv/SrvDiscoveryModule.java
* Indetentation fixes
* Removed tabs
* Fix gradle dependencies for tests