Merge "Bug 4354 -fromMd() doesn't convert tenant_id to neutron object"