EB-7895 Repace order id with web order number in error message
EB-7893 Use generic user id for punchout login if user id not found in system.
EB-7587 - Restored the changed that overrides by previous version
Merge pull request #15 from depingling/master

Changes made for  	EB-7895, EB-7893 and EB-7587