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