Bug 1061982 - manifestparser changes to support conditional subsuites, r=jmaher