Sync cfg agent with latest changes in full juno branch

Change-Id: I29bb32f1fddec900855161ff23253579c171d3ce