WATERSMART-347
* Cleaning up how versions and dev flags are passed around
WATERSMART-347
* And can remove filtering directly to jsps