Merge proposals dependent on lp://qastaging/~jamesodhunt/upstart/upstream-vim-syntax-file-update

lp://qastaging/~jamesodhunt/upstart/upstream-vim-syntax-file-update has no merge proposals.