Mitigate the development pains that have arisen from the antistatic branch merge

With atlassian-bundled-plugins.zip no longer in the source directory, Intellij will not add the zip to the WAR it builds (this is despite the fact that it is in the target directory and Maven will quite happily pick it up); I was able to work around this by copying the zip back to its old location, but this could become tiresome and error prone. Is there any way to work around this?

We also do a fair bit of tinkering with the rpc plugins and I am wondering if these changes will make development slightly more difficult for the Sydney team; I suppose we can always add the plugins as dependent modules but this will get blown away every time we do a mvn idea:idea.