updated config for two custom repos plus default activemq config
Merge branch 'master' of https://github.com/d-smith/Fuse-Vagrant

Conflicts:
	optional/local-repo-sample/README.md
	optional/local-repo-sample/org.apache.karaf.features.cfg
	optional/local-repo-sample/org.ops4j.pax.url.mvn.cfg