Update EPP ARM to reflect implementation in 3.5.0

This makes minor adjustments to the ARM to make it up to date with
the implementation merged into 3.5.0.
* Change of function names
* Stricter rules for parameterized templates
* Changed syntax for Template Parameters (using | | instead of ( ))
around parameters.
Merge branch 'master' of ssh://git@github.com/puppetlabs/armatures.git