MOBSDK-746: Favorites cache is mixing up favorite sites and favorite folders.
Merge branch 'topic-MOBSDK-746'
Merge pull request #293 from gavincornwell/master

MOBSDK-746: Favorites cache is mixing up favorite sites and favorite folders.