Thought about checking into this and seeing if I can help, but the post is several months old. Is this still a valid question or did you find a solution? Let me know and I'll spend some time on it.
I think I just accepted the requirement to have to recreate all the properties as "this tenant". It was the only way I could find to get past this one unfortunately