Merge "Improvement to opendaylight-configfile-archetype"