Merge "fix metadata for contrail 4.x"