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