am 64f5fe27: Merge "property_service: get rid of hard coded property / control list"

* commit '64f5fe2796c5d20e0b1069837cac269f4aade331':
  property_service: get rid of hard coded property / control list