Merge proposals dependent on lp://staging/~johill-lanl/epics-base/server2

lp://staging/~johill-lanl/epics-base/server2 has no merge proposals.