SRAMP-567 Exception Integration Tests
SRAMP-488 Use the maven-bundle-plugin in WAR projects
Merge pull request #489 from brmeyer/SRAMP-488

SRAMP-488 Use the maven-bundle-plugin in WAR projects
Merge pull request #488 from dvirgiln/SRAMP-567

SRAMP-567 Exception Integration Tests
SRAMP-566 Remove Fuse from installer and replace with new Karaf commands
Merge pull request #487 from brmeyer/SRAMP-566

SRAMP-566 Remove Fuse from installer and replace with new Karaf commands
fixed a problem with the osgi manifest being included in two places in the fuse wars
Merge pull request #491 from EricWittmann/osgi-manifest

fixed a problem with the osgi manifest
SRAMP-569 Create maven plugin to merge .properties files
Merge pull request #490 from dvirgiln/SRAMP-569

SRAMP-569 Create maven plugin to merge .properties files
SRAMP-29 StoredQuery support
Merge pull request #494 from brmeyer/SRAMP-29

SRAMP-29 StoredQuery support
Sramp -> static SrampConfig
NON-NLS
SRAMP-566 renamed s-ramp-install feature to s-ramp-karaf-commands
SRAMP-29 stored query docs
docs: combined GuideSrampRestAPI and GuideOverlordSrampRestApiEndpoints
reorganized docs structure
SRAMP-433 corrected ontology update event, added JMS ontology test
SRAMP-433 jms docs