Merge "Remove stray ssl/Makefile"