Merge pull request #168 from KurtStam/master

small fixes
fixing build
fixing null pointer when rolling back before initialized
Merge branch 'master' of git://github.com/Governance/s-ramp
adding shell-api jar to the cp
excluding jaxb
increasing deployment timeout