Merge pull request #327 from KurtStam/master

 SRAMP-242,  	SRAMP-243 and  	SRAMP-244
Fix for: https://issues.jboss.org/browse/SRAMP-241
Merge pull request #328 from EricWittmann/sramp-241-config

Fix for: https://issues.jboss.org/browse/SRAMP-241
SRAMP-245 fixing compile error
Merge branch 'master' of git://github.com/Governance/s-ramp