I have set Australia as the default Country and included it in all addresses to let the map plugin work. BUT, this puts Australia at the end of all local addresses which looks silly and is a problem when printing labels.
I think default country should display or print if it is included in an address. I have modified the file lib\utilities\AddressFormatter.class.php(svn 590) to do this. It works for me, but could probably be done in a cleaner way.
File attached
Modified AddressFormatter.class.php
I didn't see your code before fixing it myself. applied in rev. 700.