Marrakesh is already in the game would be odd for them to remove it to add in the Morroco civ. I can't believe they will add them seeing as having the CS has disallowed so many other civs already.
Forthis expansion alone they have already removed Warsaw, Rio de Janeiro and Lisbon. They've already removed Copenhagen, Olso, Helsinki, Stockholm, Seoul, Vienna, Edinburgh and Dublin. They have absolutely no qualms about removing city states to add full civs. In fact, the way they go about removing and replacing these city states is the basis of an idea that is based on colour-type combinations of added or moved civilizations, which if it remains consistent (and it has with two city states added so far) would mean that Venice has been removed and replaced by someone.
Also, before you ask, Lisbon was an added City state in Gods & Kings.