Adds original attribute ID to order product/service attribute items
Inserts attrid from test data into database if available
Merge pull request #386 from nsendetzky/master

Adds original attribute ID to order product/service attribute items