Code tidying, bug fixes and bringing 12.2 islandora up to date in line with FBA customisation of Sidora