PLAT-6867 Simplify holiday store by removing uniqueid
PLAT-6867 Correct javadoc
PLAT-6867 correct exception message