Offer option to remove console handler; fix variable shadow bug.

The rest of the integration tests will need updates due to the fix of
the variable shadow bug.
Fix variable shadow bug, use absolute import in two integration tests.
Remove executable bits on some non-executable files.
Merge remote-tracking branch 'upstream/demo2' into demo2