.vagrant/** sdp/** .DS_Store *.pyc
Merged two changes initiated on main down to:
Change @22826 by robert_cowham: Ignore some files on Mac.
Change @22950 by awkan/ttyler: Provide an override for difference
between proxy listening port and target port
Routine merge to dev from main using:
p4 merge -b perforce_software-sdp-dev
|#1||15838||tom_tyler||Added .p4ignore file to avoid .vagrant folder.|