Update tkp build to handle separate master & cycle0