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