Test set fields with FormExtender Affinitic refs #5887
Merge branch 'master' of github.com:affinitic/ric.core

Conflicts:
	ric/core/content/organization.py