SRAMP-430 integrated existing s-ramp-dev-server
Merge pull request #418 from brmeyer/SRAMP-430-sramp-dev-server

SRAMP-430 integrated existing s-ramp-dev-server
remove 1.7 target from s-ramp-dev-server
SRAMP-428 fuse61 datasource
Merge branch 'master' of https://github.com/Governance/s-ramp
Merge pull request #419 from brmeyer/SRAMP-428

SRAMP-428 fuse61 datasource
s-ramp osgi feature depends on overlord-commons-idp
SRAMP-428 jdbc connection pooling
fix for: https://issues.jboss.org/browse/SRAMP-429
Merge pull request #420 from EricWittmann/SRAMP-429

fix for: https://issues.jboss.org/browse/SRAMP-429
minor tweak to backup jetty.xml filename
Merge branch 'master' of https://github.com/Governance/s-ramp

Conflicts:
	s-ramp-distro/s-ramp-distro-fuse61/pom.xml
	s-ramp-installer/src/main/resources/scripts/fuse-6.1.xml
fuse fabric