FAIMS-818: fix error when saving arch entity raising exception
Merge branch 'master' of github.com:IntersectAustralia/faims-android