Merge "Fix missing test"
authorMark Beierl <mark.beierl@emc.com>
Thu, 14 Jul 2016 20:08:51 +0000 (20:08 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 14 Jul 2016 20:08:51 +0000 (20:08 +0000)

Trivial merge