worked on CRM-12916, setting state defaults
Merge pull request #1074 from kurund/CRM-12916

worked on CRM-12916, setting state defaults