Bug 983262 - Fix check for self.test_manifest in b2g scripts which always returns false, r=jgriffin
Bug 985600 - Stop setting JAVA_HOME in buildbot and mozharness to a dir that does not exist. r=armenzg
Merge default -> production

$ hg merge -r default -P
changeset:   2551:f33fc282295b
parent:      2549:ab87fc91c1f7
user:        Andrew Halberstadt <ahalberstadt@mozilla.com>
date:        Wed Mar 19 18:14:08 2014 -0400
summary:     Bug 983262 - Fix check for self.test_manifest in b2g scripts which always returns false, r=jgriffin

changeset:   2552:f19d877b625b
tag:         tip
user:        Justin Wood <Callek@gmail.com>
date:        Wed Mar 19 15:02:41 2014 -0400
summary:     Bug 985600 - Stop setting JAVA_HOME in buildbot and mozharness to a dir that does not exist. r=armenzg

--HG--
branch : production