Merge ecms and calendar less changes into platform-ui