Updates from PyDev: Fix for case when python-future is installed and provides a dummy 'builtins' module even on Python 2. #PyDev-845

(cherry picked from commit 11482b4b)