Relations between the two allies soured but their recent reconciliation has serious implications for Morocco’s neighbours, especially the Sahrawis