ref #6241 change @date to @since (fix)
ref #6241 change @date to @since
merge validation2 and model 3.5 into trunk
merge cdmlib-service from validation branch to trunk