Merge "Update Gemfile and Makefile configuration   - One Gemfile for all formulas tests   - Update Makefile for OpenStack tests"