Regarding option 1, some properties upgrade both rooms, some just upgrade one. When I booked two rooms at IC Prague, they specifically mentioned that only my room was upgraded. I had a bigger room, but we were both on the same floor. There was a bottle of wine in both rooms though and a welcome letter addressed to me in both as well.
At IC Istanbul, both rooms were upgraded.
Regarding option 2, I have no idea.