DESTROY ISLANDORACM!!!

There is something weird happening as I'm getting an error:
Warning: DOMDocument::schemaValidate(): Element '{http://www.islandora.ca}collection_policy': Missing child element(s). Expected is one of ( {http://www.islandora.ca}content_models, {http://www.islandora.ca}staging_area ). in CollectionPolicy->__construct() (line 50 of /var/www/drupal/htdocs/sites/all/modules/islandora_solution_pack_collection/includes/collection_policy.inc).
InvalidArgumentException: The given collection policy is not valid. in CollectionPolicy->__construct() (line 51 of /var/www/drupal/htdocs/sites/all/modules/islandora_solution_pack_collection/includes/collection_policy.inc). 

Which to me makes sense as after I apply the pull request my collection policy looks like:
<collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Newspaper collection" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd">
  <search_terms></search_terms>
  <relationship>isMemberOfCollection</relationship>
</collection_policy>

If I load that in oxygen and try to validate it against the xsd located in the collection solution packs xml directory it fails.  The xsd looks like it hasn't been updated in 2 years and it also looks like our code still tries to use it.  If I look at line 50 of collection_policy.inc it still has code to load the xsd and tries to validate the collection_policy datastream.  I'm looking at the 7.x branch of collection solution pack and the 7.x branch of the newspaper solution pack with this pull request applied.

I'll poke around some more to see what I'm missing.