Incremental commit: extract common MAP2 signature

Signed-off-by: David Scott <dave.scott@eu.citrix.com>