Merge "Use generate_defaults instead of os_defaults fixed parameters"
authorjose.lausuch <jose.lausuch@ericsson.com>
Tue, 2 Feb 2016 08:45:42 +0000 (08:45 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 2 Feb 2016 08:45:43 +0000 (08:45 +0000)

Trivial merge