MAESTRO-2481 Move demo stuff to puppet-maestro_demo

Also adjust Vagrantfile and get-maestro.sh to work with 'BRANCH' env variable properly
bump the Maestro module
don't overwrite common.yaml if already exists
Upgrade maestro and agent
Set the right version in the spec
Merge branch 'master' into development
updated Maestro module to latest
update puppet modules and use new demos
update the modules
bump
updated modules
add test dependencies
open activeMQ as well

Can be used to connect a local agent for testing, or for running the
maestro-test-rig smoke tests
bump android to latest
open postgres port
make VM memory configurable
bump to release versions