Merge "Added opportunity remove service item." into release/2019.2.0