JBOSS-19:
fix build errors
JBOSS-19:
fixed broken patch