Creating branch of trunk to collate devs for AMM15 - nemo3.6 stable branch, plus orig package branch, plus OBS branch.