Populate __context__ with retcode; Fixes issue #5518
fix spacing, switch to cmd.retcode
Merge pull request #6378 from naiyt/develop

Populate __context__ with retcode; Fixes issue #5518
Merge pull request #6379 from doublerr/apacheTasks

fix spacing, switch to cmd.retcode
Merge branch 'develop' into with-pylint-pragmas