integration/docroot only for master, and tweak messages

Change-Id: I7ed58d03c18845f782a434b425cb501f612ff038