Added to changelog. Maybe fixed mock import on 2.7

Author: anselor

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 0.8.6 (TBD)
     * Bug Fixes
-        * TBD
+        * Commands using the @with_argparser_and_unknown_args were not correctly recognized when tab completing help
 
 ## 0.8.5 (April 15, 2018)
 * Bug Fixes

tests/conftest.py

@@ -8,7 +8,10 @@
 import sys
 
 from pytest import fixture
-from unittest import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import cmd2