Port Commit 1138f07 from dev
Merge branch 'release-1.19' into develop

Conflicts:
	src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityPropertyFormTest.java