Merge "Repo tidy-up + licence scrubing" into stable/colorado
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Tue, 20 Sep 2016 14:21:46 +0000 (14:21 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 20 Sep 2016 14:21:46 +0000 (14:21 +0000)

Trivial merge