Added version dependent test for IMREAD_COLOR.
Merge branch 'minor_changes' into proto_data_layer
Fixing more build errors for travis.