Revert "F #4913: Remove templates that have images with spaces"
Revert "F #4913: Remove templates that have images with spaces"

This reverts commit 33b9d899b1a8238db67771905d89b0135933be34.

This commit includes manual modifications of the revert.

(cherry picked from commit 8bc97bd8d1c86d7a11fb37a6834e59e1f156a63f)

OpenNebula/one,atodorov-storpool/one,atodorov-storpool/one,baby-gnu/one,baby-gnu/one,baby-gnu/one,atodorov-storpool/one,atodorov-storpool/one,abelCoronado93/one,abelCoronado93/one,OpenNebula/one,baby-gnu/one,baby-gnu/one,abelCoronado93/one,baby-gnu/one,baby-gnu/one,OpenNebula/one,OpenNebula/one,atodorov-storpool/one,OpenNebula/one,atodorov-storpool/one,atodorov-storpool/one,baby-gnu/one,OpenNebula/one,OpenNebula/one,OpenNebula/one,abelCoronado93/one,atodorov-storpool/one,atodorov-storpool/one,OpenNebula/one,abelCoronado93/one,abelCoronado93/one,abelCoronado93/one,abelCoronado93/one