* Allow sigil.properties files to specify -singleton=true to cause bundles created by this project to be marked as singletons FELIX-1351 * Tidy up large methods into sub methods for readability