Merge "Fix path of os_defaults.yaml" into stable/brahmaputra
authorjose.lausuch <jose.lausuch@ericsson.com>
Tue, 12 Jan 2016 12:33:53 +0000 (12:33 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 12:33:53 +0000 (12:33 +0000)

Trivial merge