Porting fixes from groovy branch (QT4_WRAP macro, OCTOMAP_INCLUDE_DIRS)