Merge pull request #3182 from ccin2p3/f/config-return-codes