Merge "add timeout-ness to karaf console keyword"
-rw-r--r-- 260 .gitignore
drwxr-xr-x - test
drwxr-xr-x - vm