contributor in test factories should always be Person rather than User

see - SYSMO-1366
Fixes to tests affected by changing contributors in factories
Merge branch 'seek-unstable' into vln-merge

Conflicts:
	test/factories.rb