Merge changes Ie9dd5d5d,Ifc6038c1

* changes:
  libadf: convert to C++
  libadf: adf_test: fix crash on adf.devices failure