Update to 61e3c359 commit of surveyor

Some of these changes to surveyor are required by the
field application merge/sync with cases