Merge branch 'stable-3.3'

* stable-3.3:
  Evict the project cache for reloading the project.config

Change-Id: Iffe20a91b3141b7714723aa3ef2de67db4cc0ebe