CLOUDSTACK-7645: UI: Fix method for extending dictionary

Instead of mapping both dictionary JSP files to separate objects, extend
dictionary2's object onto single 'dictionary' object.

-- The previous approach was causing issues on certain dialogs, which were not
opening due to possible missing labels.

Conflicts:
	ui/dictionary2.jsp
CLOUDSTACK-7645: UI: Fix dictionary JSP include order

-Places dictionary JSP includes at top of script includes, to help solve
a potential issue where the dictionary may not always be loaded before
the UI initializes