Calendar rebase (3) 

This replaces #1352.
https://github.com/jquery/jquery-ui/pull/1341/files#diff-563a5392a566d1a29a68b1b5a37c4cb6R16