Merge to master of Phase 1

The White QA team is ready to merge to master for rs-cookbooks_ci. This is for Phase 1 of the cookbook.