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