[ACS44] templates upgrade

[Daan Hoogland]

H,

please have a look at https://reviews.apache.org/r/24229/
I will apply this on 4.4 if all right.
Any advice on testing this code?

-- 
Daan