Merge "Added an option to easily compile contrib programs with cmake" into release-4-6