Fix variable shadow bug, use absolute import in two integration tests.
Remove executable bits on some non-executable files.
Simplify exception text in console handler.
Add a log message.
Merge remote-tracking branch 'origin/demo2' into demo2
indention fix