Fix imports of com.google.inject.internal to be com.google.common.collect
Merge branch 'master' into stage