Don't assume log output is available immediately.
Lint fixes.
Merge pull request #852 from ClusterHQ/intermittent-test-failure-851

Only perform the assertion when we see a marker string in the test container output

Author: @itamarst 
Reviewer: @wallrj

Fixes #851
add sorting to unrecognised keys
Merge pull request #855 from ClusterHQ/fig-intermittent-test-failure-853

Fix intermittent failing Fig test on unrecognised config keys
Merge remote-tracking branch 'refs/remotes/origin/master' into iptables-requires-root-839
Address review comment: Remove another root check.