Berksfile.lock bumps

Since we've been keeping the same versions forever, it's hard to
see what actually works. I updated a couple of cookbooks to use
some known-good refs

Change-Id: I8e8214354876da05498d0762960af34f0f5d7312
Merge "Berksfile.lock bumps"