Merge "Update docs."
authorMark Beierl <mark.beierl@dell.com>
Fri, 25 Aug 2017 15:09:04 +0000 (15:09 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 25 Aug 2017 15:09:04 +0000 (15:09 +0000)

Trivial merge