Merge "build: Allow PLUGINS override" into stable/colorado
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Wed, 31 Aug 2016 11:32:34 +0000 (11:32 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 31 Aug 2016 11:32:34 +0000 (11:32 +0000)

Trivial merge