Upstream merge cleanup
Upstream merge cleanup

eth-cscs/nestmc-proto,halfflat/nestmc-proto,halfflat/arbor,halfflat/arbor,eth-cscs/nestmc-proto,halfflat/arbor,halfflat/nestmc-proto,halfflat/arbor,eth-cscs/nestmc-proto,halfflat/arbor,halfflat/nestmc-proto