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