Update berkshelf; fix FC043

Change-Id: I2d874db1d28214b2b6105d6000cb6272fae7c43a