merge in lmp-mr1-nova-release history after reset to lmp-mr1-dev