Backporting the patch and the test case fixed as part
of BUG#16041903 and BUG#19683834 respectively.

Note:
The refactoring requested by the cluster team has not
been backported.