Updated berkshelf to 3.1.5

Updated berkshelf from 2.0.18 to 3.1.5 in Gemfile and added supermarket source to Berksfile and locked apache cookbook to '< 2.0.0'

Change-Id: I4426d4a2f4367994dc9e66f51ae288c617a6a16b
Implements: blueprint update-berkshelf