MR to facilitate 6.82 backport

[jrping]

No description provided.

[jrping]

/build - automatically fired by gogo with following PRs and commit SHAs v1.0.0

[
  {
    "project": "",
    "component": "pccnabackend",
    "pr-id": "878",
    "commit-sha": "dc5e3163",
    "commit-full-sha": "dc5e31630f5dc21fd3ab278475631a6e8f982d44",
    "pipeline": "master",
    "org": "prismacloud/pcn"
  },
  {
    "project": "",
    "component": "gaia",
    "pr-id": "963",
    "commit-sha": "c432cee0edbe47fa008641d5adefb54dbfd80c1f",
    "commit-full-sha": "c432cee0edbe47fa008641d5adefb54dbfd80c1f",
    "pipeline": "master",
    "org": "aporeto-inc"
  }
]