Patch to repair mismatch between trunk and v1.7 branch in opal/mca/shmem type definition