Reform of the Computer Misuse Act is to be folded into a wider National Security Bill granting more powers for law enforcement to protect the UK against a wider spectrum of threats.