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