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