Merge branch 'orocreate-pkg-updates' of https://github.com/meyerj/ocl into toolchain-2.7
Merge branch 'catkin-env-hooks' of https://github.com/meyerj/ocl into toolchain-2.7