Fix YamlPropertySourceLoader to correctly flatten keys merged from different documents. Closes gh-2022
