remove Constants.PATH_SEPARATOR, use TachyonURI.SEPARATOR instead.
Merge branch 'master' into nrr2