re-commiting Conversion Service manager
re-adding a lot of files that were deleted from someone commit. =-(