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