update setup_common.sh, setup_controller.sh
Merge branch 'master' of github.com:mrkm/openstack_deploy