Promote s4watr:controlsFeature and s4watr:measuresFeature to SAREF Core
If properties are generic, then it's missing a link between saref:Device and the feature of interest it can control or measure.
My proposal is to promote the s4watr:controlsFeature and s4watr:measuresFeature (and their inverses) to SAREF Core