7.x 1.x dev

## Ready State: No

This pull request is related to the following JIRA tickets: N/A.

## Requirements & Dependencies

* None

## Deployment Instructions

* Merge code.
* Clear caches with `drush cache-clear all`
* Update database with  `drush updb`

## Usage/Test Instructions

* Rebuild and make sure everything still works