Fix account import in 0.6
Improve Account import UT
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #431 from andrerod/dev

Improve account import UT and fix 0.6 issue