More fixes for baselining (command line build).

git-svn-id: https://svn.apache.org/repos/asf/ace/trunk@1581397 13f79535-47bb-0310-9956-ffa450edef68