VIMRC updates

Reviewed by:
Review:
Testing:
Tickets: PBL-
Backport: