BZ 802571 fix to previous patch so that list_for_user works
BZ 802571 fix to previous patch so that list_for_user works

aeolusproject/conductor,aeolusproject/conductor,aeolusproject/conductor,aeolusproject/conductor