bug #2352: Set host share variables to long long type
Merge remote-tracking branch 'upstream/one-3.8' into one-3.8