Merge branch 'bugfix/err_code_collision' into 'master'

Fix error code collisions and re-enable CI check

Closes IDF-832

See merge request espressif/esp-idf!5923

Author: projectgus