Merge from Branch fop-0_91: Relaxed validation for empty static-content for compatibility with 0.20.5.