Merge "Upstream: Fuel@OPNFV pulled patches" into stable/colorado
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 31 Aug 2016 14:51:26 +0000 (14:51 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 31 Aug 2016 14:51:26 +0000 (14:51 +0000)

Trivial merge