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