ISIS-2011: merges AppManifest and AppManifest2

along with their builders.
19 files changed