Merge "Relation support for multi-charm VNFs"