Remove additional JVM options

Until properly tested remove additional JVM options from Orchestra
install
Include tag for calendar instances

To support dedicated calendar instances add support for a new tag to
identify calendar backends
Tidy up the config and add support for calendar
Add support for PIOP volumes