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