K 10
svn:author
V 8
madpilot
K 8
svn:date
V 27
2017-10-06T08:14:40.830089Z
K 7
svn:log
V 95
Fix CONFLICTS to not overwrite slave port setting.

PR:		222804
Submitted by:	vvd@unislabs.com

END