Update to new message format - AGPUSH-1046

Updates to the new message format, https://issues.jboss.org/browse/AGPUSH-534

@sebastienblanc @edewit  mind taking a look