Fixes #55. Cherry pick change for tripleo-image-elements