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