Merge "Update the upstream of tosco-parser and heat-translator to stable release...
authorshangxdy <shang.xiaodong@zte.com.cn>
Mon, 19 Sep 2016 14:23:44 +0000 (14:23 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 19 Sep 2016 14:23:44 +0000 (14:23 +0000)

Trivial merge