Use upstream patch to correct 15s timeout in psm2_init

Commits 8bb9632a, df3c165a and 4f6692ce implemented a workaround for
bug #910485, where psm2_init would take 15s to complete when the hfi1
device does not exist.

This commit introduces the upstream patch to resolve this issue and
removes the workaround patch.