Added new var to pass to diskimage-builder

Should be underscore not a dash
Added another var to address URL issue

Change-Id: I20b1ce62d391c7494d8e7921cf3b9b261ad3d75f
Fixes: bug #1169818