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