[Bug 1032050] Conflict at update of libgcj_bc1-gcc6-6.2.1+r239768-5.3.1.x86_64