Update master Grenade repo

Change-Id: Id7a4816d2bc5cc95850b91f65b696b721d81e70b
Merge "Fix javelin image name setup"