Merge pull request #75 from j-xiong/master

prov/psm: cleanup after the domain attr change; multiple EPs; FI_CHECK_OP support