Qatar appoints ambassador to UAE after years-long rift