Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into qt-dev