Add permanent fix for JBAS-7735

For M2 I did a hack to get the (build: SVN tag=xxx date=yyy) bit discussed in the parent issue to come out right. This is to fix it properly.