Jeantine/ChrisS DECO-1011 - Changed default flat shipping label and added check for invalid country