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