Oskarshamn 2 upgrades to be completed before 2016