What a shame...
Merge branch 'master' of https://github.com/HoneyBadgerTeam/Ratel

Conflicts:
	tests/src/test/java/com/payu/discovery/tests/ServiceRegistrationTest.java
what a shame...