Merge "Fix import problems of vimconnector" into v2.0