Fix: Adding changes made by Diane back into the files

Closes-Bug: 1295718
Author: Constanze Kratel <constanze.kratel@rackspace.com>
Change-Id: I6e0461eb5cca3a5eff47a2ccabd0d1bf7a9a442d