[7u40] Request for phase 2 approval for 8012366: Fix for 8007815 breaks down when only building OpenJDK (without deploy and install forests)

[Tim Bell]

This is a request to fix 8012366.  This regression was introduced in 
7u40 (by me, sadly) with my fix for 8007815.  I'd like to fix it here 
and now, and then we can all move on.

Bug: http://bugs.sun.com/view_bug.do?bug_id=8012366
Webrev: http://cr.openjdk.java.net/~tbell/8012366/webrev.02/
Review: 
http://mail.openjdk.java.net/pipermail/build-dev/2013-July/009559.html

Thanks-
Tim