Merge "Remove broken test testRfc6724Sort"