Merge changes I689ec523,Id249a185 into qt-dev

* changes:
  Delayed install completion
  Defer post-install resource clean up for 5 seconds