KBASE-971 #comment More stop script escape fixes