Merge pull request #388 from KurtStam/master

https://issues.jboss.org/browse/SRAMP-391
Fix for: https://issues.jboss.org/browse/SRAMP-235
Merge pull request #389 from EricWittmann/SRAMP-235

Fix for: https://issues.jboss.org/browse/SRAMP-235
fixed a unit test
Merge pull request #390 from EricWittmann/bugfix

fixed a unit test
https://issues.jboss.org/browse/SRAMP-385 fixing jetty install
Merge branch 'master' of git://github.com/Governance/s-ramp