Merge remote-tracking branch 'origin/production' into production
merged with origin/production
initial commit
Merge pull request #9 from PCMall/crf_47893_incorrect_item_count

CRF 47893: Incorrect item count in Verify Order page