Added changes for refactored qstat with retry logic
from 4.2-dev. TRQ-2178