FALCON-80 Option in falcon-start to not start embedded activemq. Contributed by Shwetha GS
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-falcon

Conflicts:
	src/bin/falcon-start