console cake cleanup and unification
remove duplicate define
also bring template one in sync.
Merge pull request #3726 from dereuromark/master-console-cake-unification

DS console cake unification