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