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: I00b8390c157498dd3dd618e27295b2ded790f2c9
Implements: blueprint update-berkshelf