Merge r471787 from trunk to the 1.2.x branch. Allow apr_queue.h to be included before other APR headers.