EranMes on behalf of EmmaSoderberg: Correctly number error codes in the atoms. The numbering of the codes was bothched in r17797. This caused the tests for required capabilities to fail since the wrong error code was returned. Emma, thanks for all of your hard work\!

r17811