Merge "Doclava template changes associated with default methods" am: 26990b0f64
am: e71759c8ff

* commit 'e71759c8ff7cbedd1fe629cdbe86e141c4f1f470':
  Doclava template changes associated with default methods