Merged /archiva/trunk:r885006-887051 (applied changes to scheduler manually due to different location)