Rebase from 'release/hydro/nao_msgs'
Placing rpm template files