Revert "Merge branch 'gmeier_bd2jpsieeksdetached_b2cc' into '2018-patches'"

Yunxuan Songrequested to merge
RD_2018-patches into run2-patches

This reverts merge request !1570 (merged)

Merge request reports