check
Merge pull request #1343 from jay-hodgson/release-69

log failures in the Locationable upload servlet
Merge pull request #1344 from john-hill/SWC-1941

SWC-1941 and SWC-1940
SWC-1945