Change target countries to o2m and have roles menu link to roles not int object

Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
Fix constraints on partner and benef to be by result

Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>