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