Fixed cinema profile writing on 2.1.  #227

Was not forcing CINEMA_2K, 4K images to be written out as 12bps in 2.1.0.  Was
ok in 2.0.1.

Removed "OPJ_" prefix from CINEMA_{24,48}_COMP and CINEMA_{24,48}_CS fields in
core.
Merge branch 'issue227' into devel