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