PHP cart manifest fixup and other cleanup.
Merge pull request #1648 from mrunalp/dev/php_manifest_fixup

PHP cart manifest fixup and other cleanup.