backport "-p" and "-force-rgb" options in 1.5

[detonin]

file4.jp2, file5.jp2, file6.jp2, file7.jp2 are currently failing the test suite because of this.

[detonin]

backport also "-upsample" option for kdu test suite