libnm-core: (trivial) indent NMSettingCompareFlags description for readibility
libnm-core: add NM_SETTING_COMPARE_FLAG_IGNORE_TIMESTAMP flag

for ignoring timestamp when comparing settings or connections.
cli: ignore timestamp when comparing connections in the editor
merge: add a flag for ignoring timestamp and use it in nmcli (rh #1122995)

NM_SETTING_COMPARE_FLAG_IGNORE_TIMESTAMP can be used to ignore timestamp
while comparing connections.

https://bugzilla.redhat.com/show_bug.cgi?id=1122995
device: Remove unmanaged slaves from master when they disappear

We've previously been just watching for state changes into UNMANAGED state. No
state change is emitted upon removal of a device which is already unmanaged.
cli: fix showing secrets in nmcli editor (bgo #737415)

Put secrets into the local connection.

https://bugzilla.gnome.org/show_bug.cgi?id=737415
cli: Watch for device as well as AC state changes when activating

The signals might be delivered in no particular order and we need to wait for
the device to reach stable state (whether it's successfully conntected or not)
as well as the active connection to leave ACTIVATING state.
Merge remote-tracking branches 'fd/lr/ipv6-tokens', 'fd/lr/nm-1-0-fixes', 'fd/lr/unmanaged-slaves', 'fd/lr/device-activation' and 'fd/lr/veth-managed' into integration