First is simple, Slave Revolt is resolved in way A.
Second one is harder. Relevant rules:
Quote:
30.421 [...] After the end of the current calamity phase, the tokens again function normally.
and
Quote:
29.8 Once all calamities are resolved, players must again check for city support as explained above (26.3).
Some argue that 29.8 describes that you should redo a previous phase, and thus you have left the Calamity phase. Other argue that as it is a 29.X paragraph it's part of the Calamity phase. In the first interpretation you can remove any tokens and still have city support. In the second one you can't.
The end result is that you'll have to figgure out a house rule in the group you are playing stating wich interpretation you'll play by. I'm used to playing with the second interpretation, though I'd argue that the first one is what was intended, as this otherwise would be the only case where you have to remember what happened earlier in the turn without marking it down anywere.
In civproject it's simpler. There "Check for City Support" is its own phase, listed separately in the sequence of play (§12, page 11). The CivProject rules is thus equvalent with the first interpretation of the AdvCiv rules.