Bug 918339 - Remove unnecessary lambda and conditionalize at_exit registration.
Merge pull request #1585 from nhr/BZ918339

Merged by openshift-bot