Merge "Rebase: upstream DEA mechanism changes"
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 19 Aug 2016 15:48:47 +0000 (15:48 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 19 Aug 2016 15:48:47 +0000 (15:48 +0000)

Trivial merge