KAZOO-2845 ready for merge
KAZOO-2845 don't start nksip yet
KAZOO-2845 tweaks