KRAFOO-1234: this is a demo showing rebase
Merge pull request #461 from leoherbie/f_it_up

KRAFOO-1234: this is a demo showing rebase
KCINFR-979: fixing opportunity selection
Merge pull request #464 from leoherbie/s2s_fix

KCINFR-979: fixing opportunity selection