Re-added conditionals around component registration 

... and corrected eucalyptus-testing repo.