Merge "Remove redundant --wait-for-staged-ready flag"