fix env.sh for plain cmake packages to not define _CATKIN_SETUP_DIR
Merge pull request #521 from ros/fix_plain_cmake_environment

fix env.sh for plain cmake packages to not define _CATKIN_SETUP_DIR