Changes required by upstream renaming of nrepl to cider
merge