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