Merge "add timeout-ness to karaf console keyword"