NOTICKET: Merging OSM/master to OSM/projects

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>