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