.
Merge remote-tracking branch 'upstream/master'
'merge conflicts'
selfcare Activation Process
selfcare Activation Process code
email and entitlement changes
.
Merge pull request #231 from LAshokReddy556/master

Selfcare Activation
discount on net charge
.