missing client dependencies
Merge Gerrit master branch

I accidentally pushed directly to git.beaker-project.org, skipping
Gerrit, which caused the two to diverge.