Changes in place to allow command-timeout and max-duration
Hot fix 201
Merge branch 'hotfix-bpfd-201'