Added in the two modules from closed Feature/resourcesrulesdbprovider #165
CS fixes