release/21.3.3

John Derek Chapman

@jchapman

1a53aa2c · Merge branch '21.3' into '21.3' · May 31, 2018

Further development of NSW and L1 Calo code. Synchronised with developments in `release/21.0.72`.