move failing test to problematic build
Merge remote-tracking branch 'origin/maintenance-3.x' into maintenance-3.x