Merge branch 'refs/heads/release/nomad-1.1' into develop
Fixed handling multiple boxes in listing with statuses
Merge branch 'refs/heads/develop'