Merge "Don't fork a templater process, use the library" into stable/colorado
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Mon, 26 Sep 2016 16:48:44 +0000 (16:48 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 26 Sep 2016 16:48:44 +0000 (16:48 +0000)

Trivial merge