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