Defect#277 : Fixing branch management

Change-Id: Id8eaacf87b6ca30e7a40e3bb1cdfa801d42609e4