Backport hdp21 to 5.1

Didn't add any references to the shim in big-data-plugin project, to be done according to SP-1403