Merge pull request #70 from mbiarnes/master

fixing individual issues for jboss ip-bpm upgrade to 6.0.0.CR8