Code tidy and licence update
#4137 temp ignore failing tests