Stop patching the GenericResource's property_schema

This is causing test failures if you add a new test
and don't reset the scema to {}, this seems to be timing
related. Just add Resource types that we need prevents the
need for this patching.

Change-Id: If7ddd2b1ffa8b54025c0369fe8c4f7440f0e3cdc
Merge "Stop patching the GenericResource's property_schema"