Fix Polycom config_files
Merge remote-tracking branch 'origin/v5' into v5