allow more variations of "cherry picked"

people sometimes get creative

Change-Id: Idcb52ca5a4cc0561d80f6b8c74010d701c854dc0
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>