[1508] Update ckanext-harvest - Deal with extras better. Fix issues raised by tests.