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