Merge pull request #58 from bfitzpat/jbosstools-4.1.x

JBTIS-289 - Build fixes and adjustments based on Max feedback