Merge with upstream to avoid conflicts
pending merges:
Ryan Harper 2016-06-14 [merge] reporting: set webhook handler level to DEBUG, no filtering
Ryan Harper 2016-06-14 [merge] merge from trunk
Ryan Harper 2016-06-14 reporting: default webhook handler level to DEBUG, no filtering
Scott Moser 2016-06-14 [merge] improve net-meta network configuration
Scott Moser 2016-06-13 spelling
Scott Moser 2016-06-13 log cleanup
Scott Moser 2016-06-13 improve net-meta network configuration
Ryan Harper 2016-06-03 [merge] curtin/net: fix inet value for subnets, don't add interface attributes to alias
Ryan Harper 2016-06-03 [merge] curtin/net: calculate the inet value for each subnet independently
Mike Pontillo 2016-06-03 Address review comment.
Mike Pontillo 2016-06-02 Don't append the '6' to IPv4 aliases if an IPv6 alias preceded it.
Mike Pontillo 2016-06-02 Add failing test case for bug #1588547
Ryan Harper 2016-06-03 [merge] curtin/net: Don't add interface attributes to alias interfaces
Mike Pontillo 2016-06-03 Don't add additional parameters to alias interfaces. (Rebase from trunk and address review comments.)