Merge remote branch 'origin/8.34' into 8.36

Conflicts:
	.hooks/post-checkout
	dls-config/bin/gda_servers_local
	dls-config/bin/java
Merge branch '8.36'

Conflicts:
	.hooks/post-checkout
	dls-config/bin/gda_servers_local
	dls-config/bin/java