Merge pull request #1624 from glneo/less-cache-flushing

PSCI cache flush and comment fixup