Merge "To update the yardstick stable branch."
authorJiang, Yunhong <yunhong.jiang@intel.com>
Mon, 17 Apr 2017 16:28:45 +0000 (16:28 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 17 Apr 2017 16:28:45 +0000 (16:28 +0000)

Trivial merge