location entity: allow 3 time blocks for regular and exception hours
Merge branch 'refs/heads/master' into test