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