Commit - JAL-4107 fix bad merge bits. still quite there
Commit - JAL-4107 merge from 2.11.5.0 to 2.12
Commit - JAL-4107 update 2.12 from 2.11.3 - continuing MMW merge