Merge pull request #712 from nsendetzky/master

Sets VAT ID only if a value is available and places it at the same location in all tables
Merge pull request #713 from nsendetzky/master

Sets the new VAT ID always to prevent errors in unit tests
Merge pull request #714 from nsendetzky/master

Improves compatibility with existing implementations