Merge pull request #344 from mstruk/LIVEOAK-573

LIVEOAK-573 Common pattern violation using ResourceSink
LIVEOAK-580 Change SynchronousResource.properties() to return Map