Feature #2898: Flow template instantiate + merge in CLI