Merge "Correct cluster metadata for contrail-network-controller"