CB-4340 Auto-detect target pin when its not there

Reviewed by Bryan Higgins <bhiggins@blackberry.com>