Merge commit 'refs/changes/43/1843/1' of https://git.opendaylight.org/gerrit/affinity