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
Merge branch 'master' of https://github.com/Governance/s-ramp into SRAMP-570
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
Merge branch 'master' of https://github.com/Governance/s-ramp into SRAMP-570

Conflicts:
	s-ramp-karaf-commands/src/main/java/org/overlord/sramp/karaf/commands/ConfigureCommand.java