Heart Beat - server site
Merge remote-tracking branch 'origin/master'

Conflicts:
	discovery-client/src/main/java/com/payu/discovery/client/ServiceDiscoveryClientConfig.java