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