Uncommenting code
Removing duplicate code
A fix for the unit test
Merge remote-tracking branch 'origin/dev/FIXUNITTEST' into release/2.6.4rc

Conflicts:
	queue/src/test/resources/org/ambraproject/queue/SavedSearchRouteMonthlyTest-context.xml
	queue/src/test/resources/org/ambraproject/queue/SavedSearchRouteWeeklyTest-context.xml
increasing maven version to 2.6.4