Fix log detection post-5187
Merge branch 'master' of github.com:pcmanus/ccm

Conflicts:
	ccmlib/node.py