A commit was made to jbds 7.x last-minute to avoid the breakage (~~JBIDE-16765~~), so once we have that go GA, we can push this patch here on stacks. No change to the jdf PR will need to be made.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira