Merge 2.8.4 3
Our delta for sh instead of bash are included in upstream. We got golang-1.11 builds in apertis. No longer need to disable golang in this package anymore. So here we drop all our delta and use upstream version without any modification instead.
Edited by Ritesh Raj Sarraf