Merge "Backport git based patching from Fuel@OPNFV."
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 28 Jun 2016 12:56:51 +0000 (12:56 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 28 Jun 2016 12:56:51 +0000 (12:56 +0000)

Trivial merge