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