#22525 Lint cleanup.
Ticket #22525 - Added support for collating items
Merge branch '22525_collate_support'

* 22525_collate_support:
  Ticket #22525 - Added support for collating items
  #22525 Lint cleanup.

Conflicts:
	python/tk_hiero_export/shot_updater.py