Merge branch 'master-svn-sweep' into 'master'

Master svn sweep to 2017-02-06

This merge request contains the SVN changes to 22.0.0 (non-VAL) from 2107-02-02 to 2017-02-06.

This merge request is the first true test of moving changes from SVN into a *live* git branch.

This set of changes will be the starting point for fixing the master branch build.

See merge request !168

Former-commit-id: 3210a651