OpenCV should be compiled using pkg-config options.
Merge branch 'minor_changes' into proto_data_layer