Hunterised v1.16.1

Standard hunterisation changes. Updates to use packages from hunter as much as possible.

Note this replaces accidentally created release 1.61.1-idscan0