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