Merge "Properly handling ubuntu directory as a non top of repository" into stable...
authorMichal Skalski <mskalski@mirantis.com>
Wed, 3 Feb 2016 12:27:04 +0000 (12:27 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 3 Feb 2016 12:27:05 +0000 (12:27 +0000)

Trivial merge