Some more changes to update to coll v1.1.0 that were missed

yesterday.  This actually exposed a very, very long-standing bug where
part of the coll base was incorrectly checking the coll API version
against the MCA API version.  When coll went to v1.1 (yesterday) and
was no longer the same as the MCA v1.0, the test started failing.

This commit fixes to check for v1.1 everywhere in the coll base, and
to ensure to check coll framework/API version numbers against coll
framework/API version numbers (vs. against the MCA API version
number).

This commit was SVN r16373.

ompi/mca/coll/base/coll_base_comm_select.c

@@ -359,12 +359,12 @@ static int query(const mca_base_component_t *component,
                  ompi_communicator_t *comm, 
                  int *priority, mca_coll_base_module_1_1_0_t **module)
 {
-  /* coll v1.0.0 */
+  /* coll v1.1.0 */
 
   *module = NULL;
-  if (1 == component->mca_major_version &&
-      0 == component->mca_minor_version &&
-      0 == component->mca_release_version) {
+  if (1 == component->mca_type_major_version &&
+      1 == component->mca_type_minor_version &&
+      0 == component->mca_type_release_version) {
     const mca_coll_base_component_1_1_0_t *coll100 = 
       (mca_coll_base_component_1_1_0_t *) component;
 

ompi/mca/coll/base/coll_base_find_available.c

@@ -159,7 +159,7 @@ static int init_query(const mca_base_component_t *m,
      it. */
 
   if (1 == m->mca_type_major_version &&
-      0 == m->mca_type_minor_version &&
+      1 == m->mca_type_minor_version &&
       0 == m->mca_type_release_version) {
     ret = init_query_1_1_0(m, entry, enable_progress_threads,
                            enable_mpi_threads);