#698: Added country and state/province field for Forms module