Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac

Minor conflict repair

Conflicts:
	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
index c8a4ea7,af1c3fc..d86a1f4
--- 1/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
--- 2/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
@@@ -36,8 -36,10 +37,10 @@@ sub load_record 
      if ($ctx->{staff_saved_search_size}) {
          $ctx->{saved_searches} = ($self->staff_load_searches)[1];
      }
+     $self->timelog("past staff saved searches");
  
 -    $self->fetch_related_search_info($rec_id);
 +    $self->fetch_related_search_info($rec_id) unless $kwargs{no_search};
+     $self->timelog("past related search info");
  
      # run copy retrieval in parallel to bib retrieval
      # XXX unapi