Fix #2533116
Fix #2532025
Fix #2533101
Merge branch 'trac2532025' into sprint5bugfixes

Merge branch trac2532025 into sprint5bugfixes.
Merge branch 'trac2533116' into sprint5bugfixes

Merge trac2533116 into sprint5bugfixes.
Merge branch 'trac2533101' into sprint5bugfixes

Merge  trac2533101 into sprint5bugfixes.
Fix #2533124
Updated category axis unit test for trac2533124.
Merge branch 'dev-3.x' into sprint5bugfixes

Merge latest dev-3.x into branch.
Merge branch 'trac2533124' into sprint5bugfixes

Merge topic branch trac2533124 into branch.
Merge branch 'sprint5bugfixes' into dev-3.x

Merge 2533124, 2533101, 2533116 and 2532025 bug fixes into local dev-3.x.