Updated berkshelf to 3.1.5

Updated berkshelf from 2.0.18 to 3.1.5 in Gemfile and added supermarket source to Berksfile

Change-Id: Ic3bfec5014340b270266c3d49e53499c3b1e1b72
Implements: blueprint update-berkshelf