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