COMAC-97 Apply the latest changes to comac-in-a-box

Tested with the latest patch: https://gerrit.opencord.org/#/c/15057/

Change-Id: I584df922cddc739142d4bf6435b2223354101527
3 files changed