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