Merge "Add contrail repository location to system metadata"