cherry pick from master to 5.0

[Sep 23, 3:36PM] https://github.com/pentaho/pentaho-platform/commit/1da2bfb6312866815dac869cb82bb71559710145
[Sep 23, 6:35PM] https://github.com/pentaho/pentaho-platform/commit/a8740621811826dbd8b3afea46bd56354913d4ea
[Sep 24, 8:18PM] https://github.com/pentaho/pentaho-platform/commit/6404b38f63347e5ecbbe12c469f69a12ebb3ec19
[Sep 25, 1:25AM] https://github.com/pentaho/pentaho-platform/commit/e6f0dcf1943f2a610f6276cab23db4cb3a21cef6
[Sep 25, 3:03PM] https://github.com/pentaho/pentaho-platform/commit/1a43e3c1ac1896ba39307a4e06155bd468fd3c7d
[Sep 25, 7:55PM] https://github.com/pentaho/pentaho-platform/commit/67414e6b1945bfcb4b6c419d7a99e2c7341e813b
[Sep 27, 3:33PM] https://github.com/pentaho/pentaho-platform/commit/352e46f6da495a7f3a8caec68db465fd27432807
[Sep 27, 3:34PM] https://github.com/pentaho/pentaho-platform/commit/35be4a8e969e1fc18cac21736adffeead99e3b32
[Sep 27, 3:34PM] https://github.com/pentaho/pentaho-platform/commit/19340c80563d80940536d5017f38f8704382dd4e
[Sep 27, 3:34PM] https://github.com/pentaho/pentaho-platform/commit/bbe61be59d6dbeb97b47dd0190f37b2a17f338b8
[Sep 27, 3:35PM] https://github.com/pentaho/pentaho-platform/commit/4c74bf509bbf443dfa54185cd09e0e2c4ed79fd2
[Sep 27, 3:37PM] https://github.com/pentaho/pentaho-platform/commit/3c735fd26e5e252c55be5a9968bf710176ee8845
[Sep 27, 3:37PM] https://github.com/pentaho/pentaho-platform/commit/d4b5314a93a8d34aabf85d5f16c07d20efabe566
[Sep 27, 3:38PM] https://github.com/pentaho/pentaho-platform/commit/ec0b1a80041720c3efa19f25dd317f2f35ac53b7
[Sep 27, 3:38PM] https://github.com/pentaho/pentaho-platform/commit/9fcb0fb2603fe5ba3c1a24ed70101d8c0571eefe
[Sep 27, 3:39PM] https://github.com/pentaho/pentaho-platform/commit/7ed6fa4ee6a41e15e655c942ff22efc2221a0a38
[Sep 27, 3:39PM] https://github.com/pentaho/pentaho-platform/commit/21256fd21edffdb4ac238942b25b65379d907401
[Sep 27, 3:39PM] https://github.com/pentaho/pentaho-platform/commit/25618aaac6bdc04fa3ab75dc0c095006271b58b2
[Sep 27, 3:40PM] https://github.com/pentaho/pentaho-platform/commit/4003fe2b8ef74978147eae1b44ddc6bbdc9b4ec1
[Sep 27, 3:40PM] https://github.com/pentaho/pentaho-platform/commit/7a227b67f6bdf8ee38384c1eabc8a0e12e5afba7
[Sep 27, 3:42PM] https://github.com/pentaho/pentaho-platform/commit/8712c9daa8a823ed0b31e28c45e531c0553dc3b2
[Sep 27, 3:43PM] https://github.com/pentaho/pentaho-platform/commit/5fc2c15150ce9995aa1afce8ab194b56ed9f4088
[Sep 27, 3:43PM] https://github.com/pentaho/pentaho-platform/commit/c2bc6a70a0333fa1216173b8bd4ea2d743e08780
[Sep 27, 4:11PM] https://github.com/pentaho/pentaho-platform/commit/8a63f3af6d20b45775110053983e191ccf230c01
[Oct 01, 6:11PM] https://github.com/pentaho/pentaho-platform/commit/9500bf624bf9dc894e86c10b47e089589251fd0c
[Oct 02, 9:49PM] https://github.com/pentaho/pentaho-platform/commit/ce24dbc234d20c7171f95aaad23381ded9963652
[Oct 16, 1:28PM] https://github.com/pentaho/pentaho-platform/commit/ddce98d7d7bbe1a6b8793bb82fb6ef47072174cb
[Oct 16, 4:01PM] https://github.com/pentaho/pentaho-platform/commit/0c51e8be386afce0e5dd8088661ac9b1573873a5
[Oct 21, 1:26PM] https://github.com/pentaho/pentaho-platform/commit/0f9eb2fdbd9115d857f6fac8012c1bea8e6b7790 
[Oct 21, 4:49PM] https://github.com/pentaho/pentaho-platform/commit/541ac94658acad9b67d3b953a685c0dc1c5063b5 
[Oct 23, 11:50AM] https://github.com/pentaho/pentaho-platform/commit/230f152d122e559d51252789eccb50e1dcdfcbe0
[Oct 24, 10:08AM] https://github.com/pentaho/pentaho-platform/commit/9c2e221e5437030c4638d6530fbdb9279c08c456 
[Oct 30, 4:24AM] https://github.com/pentaho/pentaho-platform/commit/f42f1ed2b6da19e9934808d65590f2cb02034a3f