Merge pull request #3208 from rhc54/topic/s2

You cannot include both pmi.h and pmi2.h as they have conflicting defines in them.

opal/mca/pmix/s2/pmix_s2.c

@@ -30,7 +30,6 @@
 #include "pmi2_pmap_parser.h"
 
 #include <string.h>
-#include <pmi.h>
 #include <pmi2.h>
 
 #include "opal/mca/pmix/base/base.h"