1115631 - disabled content sources discarded before validity check performed.
Merge branch 'jortel-1115631'