match array contents, and fix merge
Merge branch 'feature_linksets'