Commiting latest branch version before merging to trunk. Contains DEPRECATED/LOGSTR for backward compatibility for CfUnit v1.0.0.0