Changes to base ContrailResource required for new resources.

Change-Id: Ia1270779c7b0d2610db04cbdd03da29e8473f674
Merge "Changes to base ContrailResource required for new resources." into R2.0