Merge pull request #1570 from marquiz/devel/apihelper-refactor-5

nfd-master: ditch apihelper

Author: k8s-ci-robot