Moving include_directories call to the right place
Merge branch 'general-etc-path' into catkin-1.2.1