Trebuchet : Make regular folders persistent

Fix incorrect if condition, so only live folder's contents
are not persisted.

Change-Id: Ide9123feb0d13cc58aaa0679710b7a285b2e30e7
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2