CLOUDSTACK-6513: remove commented code.
CLOUDSTACK-6502:Remove trailing whitespaces.