fix unsetting temporary variables - especially CATKIN_SETUP_DIR - to not influence next environment (fix #505)