JSON Cas Serialization broken for case where FS is both ref'd and indexed

The docs in the reference described this case, but it was not implemented in the code. Add the missing capabilities to properly handle cases where referenced FS were also indexed. Add a test case too.