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