Merge "Fix for breaking deployment."
authorDaniel Smith <daniel.smith@ericsson.com>
Wed, 6 Apr 2016 12:59:16 +0000 (12:59 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 6 Apr 2016 12:59:16 +0000 (12:59 +0000)

Trivial merge