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