Fixed template issues with missing paramteres
Merge branch 'master' of ssh://github.com/stelligent/opendelivery_platform