Merge pull request #48 from daniellemayne/2013.07

bugzid 5018: handle parseException when setting last boot time of server
Merge pull request #50 from daniellemayne/2013.07

bugzid 5035: fixed NPE on volume remove