some other changes for recovery only builds

Change-Id: I4f8dc34ebf15cb25ce1e696e61c9c2321e8116c4
Merge branch 'master' of CyanDreamProject/hudson