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