fixing location of configuration_file
Merge branch 'tilo-internal-release' into internal-release