Fix conflicts from merging in jcliff 1.28
Testing for resource-adapter basics
Full rules for setting up resource adapter