9292d2e63f
Some of these changes may not be necessary but comparing against the Atom Test project https://jira.agscollab.com/browse/LYN-3133