[VOL-4514] Addressing device reconciliation failure

See comments on https://jira.opencord.org/browse/VOL-4514

This change is dependent on the related proto changes to be
merged first.  Until then jenkins will fail.

Change-Id: Idc0219135388c6b1b6bbeb0ce419193e777c2ceb
14 files changed