Motivation:
modernize code, synch with other dCache projects

Acked-by: Paul Millar
Target: master