Fix some Java gateway errors and inconsistencies
Merge branch 'proxy-support' into bb-mega-merge
Delay for 3 seconds while restart the Java gateway
Merge branch 'proxy-support' into bb-mega-merge