upon activation n1ql node thinks it's not part of a cluster

When adding a n1ql node through ns_server, the node itself thinks it's not part of a cluster.
Things work fine once the node is stopped and started again.

This is down to the implementation of MB-20773 - which queries clustering on start up, and the implementation of n1ql clustering.
The issue is that ns_server does not report the n1ql service as being active until the n1ql node has been successfully added - in a way not too dissimilar from MB-22588.