Rebase from 'release/indigo/kdl_parser'
Placing rpm template files