Merge "Enable multi_tenancy option for contrail"