BZ-12081 fixed minor momentjs issues