minor fixes to catalog and jclouds properties

!= null not needed as above.