Improved the way whitelist_entry is managed
Authored by: epandurski 2013-08-16
Parent: [r2635]
Child: [r2637]