Harappa has been an object of discussion -- search through the "Unofficially Official Git Balance Discussion Thread" -- but I guess no decisions have been made about how to fix it.
It's good that you bring it up though, I had forgotten about Harappa in particular, and apparently never created a ticket for it.
Yes, the line is renamed. That is because the StoredData module is completely rewritten. If you want to enable unlimited civ switching in RFC.py, search for "data.bAlreadySwitched = True" and comment out that line.