Renamed GatewayMessages to fix classpath issue
Merge remote branch 'origin/apache-ref/v0.4.0' into baikal-GA-0.4.0