Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Introduce an optional configuration to define a regex for naming rules
  Upgrade bazlets to latest stable-3.1 to build with 3.1.12 API

Change-Id: Ie26bdb0091ec83df53548f0de9718af0abf2b275