Updating boot from volume injection functionality

* Forgotten update when changing from image test
* Adding config variable as in regular builds

Change-Id: I89d924a8c471d6cb2e7687664da04953456e4521
Merge "Updating boot from volume injection functionality"