Move away of deprecated templates classes.

Change-Id: I1c9c348080a44ed78bd50ccb16d4191e6879521c
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
4 files changed