[COMMON] Enhancements on common templates

It's a collection of small enhancements for common templates.

Issue-ID: OOM-1720
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I426f7aed05ea7e94899b9e4888f4e4c66b69cb53
2 files changed