bug 971950, make imports of vcs helper libraries optional