Squashed commit of the following:

commit 76a06dad43a5cc5547ca509d1cd426ae8dc82985
Merge: a44ce40 bd0e0cf
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Tue May 28 13:13:47 2013 -0500

    Merge branch 'master' into feature-packageuninstallmerged-cr-master

commit a44ce40a78647fd73d980bbe0767937889f9d71a
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Tue May 28 13:11:12 2013 -0500

    Renamed function from PackageUninstallMerged to _PackageUninstallMerged, added option switch to delete or preserve .save files.

commit e41f8282180cd7564b58c00671997b3f8293420a
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Mon May 27 15:48:43 2013 -0500

    Added PackageUninstallMerged().