Merge "Preserve user_config.sh vars in vagrant deploy"