White spaces fixes for EUCA-7695 and EUCA-7701

Fixes https://eucalyptus.atlassian.net/browse/EUCA-7695 and https://eucalyptus.atlassian.net/browse/EUCA-7701