Prashanth's changes based off cef 2171

Copy of **prashanth-brackets-shell** branch (pull request #487) based off of **jeff/cef_2171** branch.