changing metadata to state, pnexpires to heartbeat in response and url
adding underscore for tests
fixing ZD 4406
fixing ZD 4406
merging staging-3.6.0