resolved conflicts for merge of 7c27be31 to master-nova

Change-Id: I4c690e12ebb152dfa311e8b98feda2009b2bb1ac