Committing fix for junit ControllerGenTest and also an old js change I
forgot to commit.