Merge "Give Doclava our manifest; more permission docs." into oc-dev