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