Don't use underscore in lunch combos

Everybody works this way, only the lunch combo has been changed.

Change-Id: I5b355be437782f3033d20571ad3d7603fbdb95e8
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge "Don't use underscore in lunch combos" into jb-mr1