Merge changes I36184fee,I3429f966

* changes:
  Fix documentation dependencies for included files
  Refactor documentation build rules to expose attributes