SWC-841 Added check for null when updating view from descriptor
Merge pull request #573 from heidiso/release-12

SWC-841 Added check for null when updating view from descriptor
Merge pull request #574 from john-hill/PLFM-1592-c

log sweeping on
Merge branch 'release-12' into develop

Conflicts:
	src/main/java/org/sagebionetworks/web/client/widget/entity/editor/AttachmentConfigEditor.java