Restored logging of messages used in manual test 3
Corrected a typo in the NativeClient config
Merge branch 'nacl_fixes_refactor' into develop