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