Make non-time varying imagery providers work again.

And eliminate unnecessary CompositeImageryProviderProperty.  Just the
regular CompositeProperty will work here.