Merge "synchronize upstream about tosca-parser"
authorjulien zhang <zhang.jun3g@zte.com.cn>
Mon, 17 Jul 2017 12:42:12 +0000 (12:42 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 17 Jul 2017 12:42:12 +0000 (12:42 +0000)

Trivial merge