Combining Contention Resolution Schemes in WDM Optical Packet Switches with Multi-Fiber Interfaces