Factor out PropertiesDatastream behavior to a concern to facilitate overriding
Merge pull request #372 from dchandekstark/properties-ds-concern

Factor out PropertiesDatastream behavior to a concern for overriding