applied:
mpc-1
mpc-2
mpc-3
jhp-1
jhp-2
jhp-3
mpc-a
mpc-b
mpc-c

where mpc is bug 790855
where jhp is bug 858337

The Makefile.in conflicts have been ignored