Fix instance checking its own availability

The instance availability checks would mistakenly also check the local instance, this MR fixes that and should also fix #2199 (closed).

Test and changelog fragment included.