Ticket #49080 - shadowExpire should not be a calculated value
Description: Reverting the changes made on shadowExpire in the ticket 548.
Thanks to Gordon Messmer (gordon.messmer@gmail.com) for providing the original patch.
Reviewed by William Brown <wibrown@redhat.com> (Thanks!!).
(cherry picked from commit 14eb192b0f99ae3d811fd8a5bb40713bc85ea533)