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