Added static modifier to OctopusFactory.end()
Merge remote-tracking branch 'origin/develop' into feature/sge-adaptor