... I'm not really sure what the conflict was that caused the update to complain -- HAM just said "conflict" sadly -- so I can't really confirm that it's the same issue that you linked. Didn't mess around with apt-get as the reinstallation of kernel-power-settings via HAM was sufficiently successful (see above). It may however be related to a dependency issue with kernel-power (via kernel-feature-overclock or kernel-feature-smartreflex?) as mentioned above.
dpkg -l kernel*|less -S
sudo apt-get -s upgrade
dpkg -l kernel* > config.status.txt sudo apt-get -s upgrade > reveal.dependency.txt 2>&1