Bug 24974: part 2. Further cleanup around mutable capabilites and cleaned up markup around capabilities