Manual merge from common and u104.
Merge remote-tracking branch 'origin/common' into freebsd91p7
Merge remote-tracking branch 'origin/u104' into freebsd91p7
[freebsd91p7][env] New ability to re-install vim plugins on new machines.
[u104][vim] New include file to avoid ycm include error.