Merge "Revert "Extend XML parser to allow optional requiredFlags attribute""