upload style error msg fixes, refs #785

also reduce catalog calls for style rendering
Merge branch 'master' into integration