Bug 36896 - libglusterfs6{,-api}: file conflicts

Summary: libglusterfs6{,-api}: file conflicts