Motion sensor with bypass switch?
As I discuss in the answer you linked, that is fine.  There are some minor glitches in your drawing, but nothing worrisome.   Try 

                / Wall switch
        +------0   0-----+
        |                |
--Phase-+-----Sensor-----+-------+
                 |              Lights
--Neutral--------+---------------+


(ground removed for clarity, actually it's needed at all devices assuming NZ code does not delete this popular requirement). And this is strictly a schematic, the wiring method must be such that currents balance in each cable or conduit. 

A quality, modern motion sensor with its own neutral isn't going to have a problem with its LOAD hot being externally hottified by a switch or other motion sensor.  

A maintainer, especially one who has looked around the room and observed motion sensors, should be shutting off power at the circuit breaker.  I have no sympathy for someone who wants to work the circuit "hot", unless NZ Code has a variation that says I should.  For all the servicer knows, it's wired with a switched neutral.