[ENGOPS-561]: Remove hdp20 and mapr21 from build list
Merge pull request #116 from mattyb149/ENGOPS-561_5.1

[ENGOPS-561]: Remove hdp20 and mapr21 from build list