Archive task changes for incremental archiving
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/java/org/openskye/task/step/DiscoverTaskStep.java