[chirp_devel] [PATCH] [py2 default branch] Stock config-files handling #6079