patches for FELIX-2576 and FELIX-2575 - tidy up empty headers in headers file and allow bsn to be different to project name