Merge "consolidated docs" 2.0.0-ONAP 2.0.0-ONAP
authorShankaranarayanan Puzhavakath Narayanan <snarayanan@research.att.com>
Wed, 30 May 2018 19:49:56 +0000 (19:49 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 30 May 2018 19:49:56 +0000 (19:49 +0000)

Trivial merge