Merge branch 'stable-2.16'

* stable-2.16:
  Fix source glob in test rule
  Add stub module for integration tests

Change-Id: I605ae589a6ce1e21c157d9e313b88e961074ba4c