Merge changes I2a3cd53c,I8b9de913

* changes:
  Prevent replacing missing dependency glob rules with errors
  Support nested glob patterns