(cherry picked from commit 62d2b294)

(cherry picked from commit 55949b3e)

(cherry picked from commit 94e45d65)

(cherry picked from commit ebaa7b7e)

(cherry picked from commit d008c5c7)

(cherry picked from commit 03031838)

(cherry picked from commit a802d2a2)

(cherry picked from commit c4113116)

(cherry picked from commit 1d138944)

(cherry picked from commit c2638539)

(cherry picked from commit 9d7eb640)

Updates from PyDev: replace pytest with unittest since we're using it in env tests. Fix a merging bug with multiprocess.

(cherry picked from commit f596d3d0)

(cherry picked from commit 50859d74)

(cherry picked from commit 32eaf4fa)

(cherry picked from commit f07ccdde)

(cherry picked from commit 4dd2efe1)

Updates from PyDev: #PyDev-779: In pysrc/pydev_ipython/qt_for_kernel.py, matplotlib_options should be replaced with latest from ipython

(cherry picked from commit 3ae97cef)

(cherry picked from commit cbd02cb8)

(cherry picked from commit 0ad9d9fc)

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)

(cherry picked from commit 56c85444)

(cherry picked from commit c410fb7b)

(cherry picked from commit 9f5df331)

(cherry picked from commit 33370701)

(cherry picked from commit 2b1d1016)

(cherry picked from commit 117d79e8)

(cherry picked from commit 321ce483)

(cherry picked from commit 47ec26c0)

(cherry picked from commit 693b9626)

(cherry picked from commit 3f0d342d)

(cherry picked from commit 9f187007)

(cherry picked from commit bfc1d9ce)

(cherry picked from commit dc9b76b1)

Updates from PyDev: get rid of'use_value_repr_instead_of_str'. Implement StrPresentationProvider for django forms to get the same functionality.

(cherry picked from commit 768de617)

(cherry picked from commit a27a0f69)

Updates from PyDev: Restoring use of setuptools for namespace packages and made initialization of extensions lazy.

(cherry picked from commit 90869a89)

Updates from PyDev: Optimizing integration of extension integration and removing any setuptools dependency.

(cherry picked from commit 1c93d14c)

(cherry picked from commit 12de088b)

(cherry picked from commit 87351d30)

(cherry picked from commit 9bf3b230)