Match regular expression depending on mode. Improve common VCS settings
layout.
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>