Fix validation of sponsorship in catalyst
Update UPGRADE.asciidoc file
Added 2 config parameters to select map by vlan or map by role or both
Fix syntax
Updated NEWS file
Updated UPGRADE.asciidoc