MNT: additional entry vs datasource cleanup
MNT: additional entry vs datasource cleanup

Previously they forwarded to each other bi-directionally which made it
possible to be very sloppy about which you were using.  Make sure
Entry does not leak out.

ericdill/databroker,ericdill/databroker