Merge branch 'patch-bind-keyfiles-dir' into 'develop'

Add bind_keyfiles_dir config option

See merge request !1375
1 job for develop in 37 seconds (queued for 3 seconds)