Added config directory patch. Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry picked from commit 7a1435e5f4)
7a1435e5f4