First pass at Apache CLI integration
Removed profiling tests for now
First pass at block storage updates