Patch to fix expiration date being cleared on bulk update

The attached patch prevents the expiration date from being deleted when the node is bulk updated.

I also added additional logic to prevent the expiration field being updated when it's not needed. Sure it's only one db call, but it's not needed.