Merge remote-tracking branch 'mtharp/rpath'

Conflicts:
	src/janitor.c

Instead not flagging paused auto-db as inactive,
I moved the check to auto-db cleanup.

diff --cc src/admin.c
Simple merge

diff --cc src/janitor.c
index 6a41df1cdd46a9e9a139960529905780f3cd8c05,f02f1bda374531da4fe1e33a534034235ed2bfc1..083da52f82eb160ab7886d6ea428266bba18c2fa
--- 1/src/janitor.c
--- 2/src/janitor.c
+++ b/src/janitor.c
@@@ -520,9 -502,8 +520,11 @@@ static void cleanup_inactive_autodataba
        if (cf_autodb_idle_timeout <= 0)
                return;
  
 +      /* now kill the old ones */
        statlist_for_each_safe(item, &autodatabase_idle_list, tmp) {
                db = container_of(item, PgDatabase, head);
++              if (db->db_paused)
++                      continue;
                age = now - db->inactive_time;
                if (age > cf_autodb_idle_timeout) 
                        kill_database(db);