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