VT support for buildout mods

The reason why we ask for them separately is because the bugfix would me merged way faster than the feature(way less to review)