BZ1100998 : Applying  Lukas's  comments (removing augeas and using
runtime config)