Branch b1_4

Branch b1_4
Add check for NULL imp_conn_current.  It isn't clear whether this should
always be non-NULL (in which case locking is bad, though we can't really
expect to hold imp_lock over the whole operation) or whether it is OK
to handle the NULL case gracefully.
b=7269
r=jacob