autotools breakage after "resolving" the configure.ac conflict in TS-1902
TS-1902: Remove @LIBICONV@ from Makefile.ams

Conflicts:
	lib/ts/Makefile.am
	proxy/Makefile.am

As part of TS-1902 backport, don't forget to remove @LIBICONV@,
this, of course causes clashes with the recently backported HWLOC
changes.