SRAMP-569 Create maven plugin to merge .properties files
Merge pull request #111 from dvirgiln/SRAMP-569

SRAMP-569 Create maven plugin to merge .properties files
Merge branch 'master' of https://github.com/Governance/overlord-commons into SRAMP-570

Conflicts:
	overlord-commons-karaf-commands/src/main/java/org/overlord/commons/karaf/commands/ConfigureFabricProfilesCommand.java
	overlord-commons-karaf-commands/src/main/java/org/overlord/commons/karaf/commands/configure/AbstractConfigureCommand.java