Update repo to ODK v1.5

Before updating the repo to ODK v1.5:

• Pull the new Docker image and try using it to make sure it doesn't cause any errors with the current version of the repo.

After updating the repo to ODK v1.5, watch out for the following:

• The permission system for the docker images changed. It now provides a way to pass user permissions into the docker image instead of automatically using Admin permissions. This feature was not exhaustively tested with Windows.
• Check that the CPONT base is still correct.
• There was a major change to how the merged import is managed.
• There was a bug fix to which annotation properties get included in the imports. Now only the annotation properties included in the ANNOTATION_PROPERTIES variable (currently row 317 in Makefile) should get imported and all other annotations will be dropped. Check that this change removes the unwanted SynonymTypeProperty subclasses.