CDB-1535 Fix error on user decorator
CDB-1535 Do not process the header on non-batch geocoder runs
Merge CDB-1535 into release/2.9.1