Merge changes Id4647e54,I66b6edbd into oc-dr1-dev

* changes:
  Fix VR surface attributes.
  DVR API: Implement support for deleting surface attributes.