Added a keypoints output to DescriptorExtractor
Merged patch on optional keypoints output
Removed some cv::Param types for compatibility