Agpush 910

for https://issues.jboss.org/browse/AGPUSH-910

and a little whitespace semicolon cleanup