Revert "Trimmed the branch to only the upstream-1.9.11 sub directory"

This reverts commit aa6f7790ee69714ee75392ba353b10707f81e034.
Rebase from 'upstream' @ version '1.8.7'