Update to latest version of upstream master branch

The latest version of the upstream master branch contains bugfixes for the alarm logger service and the alarm service.

On this MR is merged, I am going to release a new version of the Phoebus product, so that we can use a release version of the Docker images for the two services instead of relying on a build that is based on an untagged commit.