Merge "Change pike symlink to copy of ocata dir"