Qatar, Morocco Seal Normal Ties after World Cup Spat