Merge pull request #232 from jmchilton/test_fix

[15.05] Fix problem with twill's custom subprocess module.

scripts/functional_tests.py

@@ -1,5 +1,9 @@
 #!/usr/bin/env python
 
+# Import system subprocess now before twill so we don't get its
+# variant that breaks things.
+import subprocess
+
 import os
 import sys
 import shutil