ATLAS-2569 ATLAS-2571 - commit?

[Nigel Jones]

FAO committers: Both of these now have a patch available. One +1 on the 
submission so far, but both are minor cleanups it would be good to get 
committed especially as our poms are regularly changing :-)