Merge "BUG-2471: create odlparent template"