Merge "Fixes unit tests"
authorDan Radez <dradez@redhat.com>
Wed, 15 Jun 2016 14:01:33 +0000 (14:01 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 15 Jun 2016 14:01:34 +0000 (14:01 +0000)

Trivial merge