[CP] Orchestration:Template fixes for 3.16-stable#10796

stejskalleos wants to merge 2 commits intotheforeman:3.16-stabletheforeman/foreman:3.16-stablefrom

stejskalleos:ls/templates-orchstejskalleos/foreman:ls/templates-orchCopy head branch name to clipboard