Removed "etc" and "build" requirements on build.xml (temporarily so that it may be built)
Merge branch 'devel-factory' into devel-newStager
Merge branch 'devel-newStager' into devel