I had missed a few places in my original commit:
2b43828fe22dbb17b4f6df875fc59af6772f3984
Change-Id: I55c0d0a79f6c3416f6ba64cfbf4c1dbb4293bd36
Reviewed-on: http://gerrit.cloudera.org:8080/616
Reviewed-by: Alex Behm <alex.behm@cloudera.com>
Tested-by: Internal Jenkins