Bug 1086886 - Don't read managed_file.yml twice

[merge]