Add remaining unapplied changes from trunk

git-svn-id: https://svn.apache.org/repos/asf/comdev/reporter.apache.org/branches/deployed@1690397 13f79535-47bb-0310-9956-ffa450edef68
2 files changed