480107: Merging branch 'ceclipseMerging' to master Bug: 480107 Change-Id: I7aa585c8dc79b41243e1a96362940ce7848011a9 Signed-off-by: Nicholas Loulloudes <loulloudes.n@cs.ucy.ac.cy>