Merge remote-tracking branch 'origin/swift-3.1-branch' into stable

* origin/swift-3.1-branch:
  [ASTReader] Add a DeserializationListener callback for IMPORTED_MODULES