commits for qa
defects

2598, 2593, 2599, 2594
discount
Merge remote-tracking branch 'origin/qa-master' into Saumya
test commit
test
Revert "test"

This reverts commit 34c763d4662d426b7ed5bf205e83fe4845bea13e.
Merge branch 'master' into stg-master
Merge branch 'stg-master' into Saumya
fix to discount
Merge branch 'Saumya' into stg-master
Merge branch 'stg-master' into Kevin