MNT: Continued fixes after removing replay
MNT: Continued fixes after removing replay

tacaswell/dataportal,NSLS-II/dataportal,ericdill/datamuxer,ericdill/datamuxer,danielballan/datamuxer,danielballan/dataportal,tacaswell/dataportal,ericdill/databroker,ericdill/databroker,NSLS-II/dataportal,danielballan/datamuxer,NSLS-II/datamuxer,danielballan/dataportal